--- old/src/share/vm/prims/jvm.cpp	2015-04-15 12:03:17.202411975 -0700
+++ new/src/share/vm/prims/jvm.cpp	2015-04-15 12:03:17.060402044 -0700
@@ -163,20 +163,20 @@
     // that caller, otherwise keep quiet since this should be picked up elsewhere.
     bool found_it = false;
     if (!vfst.at_end() &&
-        vfst.method()->method_holder()->name() == vmSymbols::java_lang_Class() &&
-        vfst.method()->name() == vmSymbols::forName0_name()) {
+        vfst.method()->method_holder()->name()->equals(vmSymbols::java_lang_Class()) &&
+        vfst.method()->name()->equals(vmSymbols::forName0_name())) {
       vfst.next();
       if (!vfst.at_end() &&
-          vfst.method()->method_holder()->name() == vmSymbols::java_lang_Class() &&
-          vfst.method()->name() == vmSymbols::forName_name()) {
+          vfst.method()->method_holder()->name()->equals(vmSymbols::java_lang_Class()) &&
+          vfst.method()->name()->equals(vmSymbols::forName_name())) {
         vfst.next();
         found_it = true;
       }
     } else if (last_caller != NULL &&
-               last_caller->method_holder()->name() ==
-               vmSymbols::java_lang_ClassLoader() &&
-               (last_caller->name() == vmSymbols::loadClassInternal_name() ||
-                last_caller->name() == vmSymbols::loadClass_name())) {
+               last_caller->method_holder()->name()->equals(
+               vmSymbols::java_lang_ClassLoader()) &&
+               (last_caller->name()->equals(vmSymbols::loadClassInternal_name()) ||
+                last_caller->name()->equals(vmSymbols::loadClass_name()))) {
       found_it = true;
     } else if (!vfst.at_end()) {
       if (vfst.method()->is_native()) {
@@ -2376,7 +2376,7 @@
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
   k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
   Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
-  return method->name() == vmSymbols::object_initializer_name();
+  return method->name()->equals(vmSymbols::object_initializer_name());
 JVM_END
 
 
@@ -2544,7 +2544,7 @@
       Symbol* name      = cp->uncached_name_ref_at(cp_index);
       Symbol* signature = cp->uncached_signature_ref_at(cp_index);
       for (JavaFieldStream fs(k_called); !fs.done(); fs.next()) {
-        if (fs.name() == name && fs.signature() == signature) {
+        if (fs.name()->equals(name) && fs.signature()->equals(signature)) {
           return fs.access_flags().as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS;
         }
       }
@@ -2574,7 +2574,7 @@
       int methods_count = methods->length();
       for (int i = 0; i < methods_count; i++) {
         Method* method = methods->at(i);
-        if (method->name() == name && method->signature() == signature) {
+        if (method->name()->equals(name) && method->signature()->equals(signature)) {
             return method->access_flags().as_int() & JVM_RECOGNIZED_METHOD_MODIFIERS;
         }
       }
@@ -3164,8 +3164,8 @@
     // This must only be called from SecurityManager.getClassContext
     Method* m = vfst.method();
     if (!(m->method_holder() == SystemDictionary::SecurityManager_klass() &&
-          m->name()          == vmSymbols::getClassContext_name() &&
-          m->signature()     == vmSymbols::void_class_array_signature())) {
+          m->name()->equals(vmSymbols::getClassContext_name()) &&
+          m->signature()->equals(vmSymbols::void_class_array_signature()))) {
       THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "JVM_GetClassContext must only be called from SecurityManager.getClassContext");
     }
   }
@@ -3211,7 +3211,7 @@
     if (!vfst.method()->is_native()) {
       InstanceKlass* holder = vfst.method()->method_holder();
       assert(holder->is_klass(), "just checking");
-      if (holder->name() == class_name_sym) {
+      if (holder->name()->equals(class_name_sym)) {
         return depth;
       }
       depth++;