--- old/src/share/vm/interpreter/linkResolver.cpp	2015-04-15 12:03:12.112056020 -0700
+++ new/src/share/vm/interpreter/linkResolver.cpp	2015-04-15 12:03:11.970046088 -0700
@@ -98,7 +98,7 @@
                           CallKind kind,
                           int index,
                           TRAPS) {
-  assert(resolved_method->signature() == selected_method->signature(), "signatures must correspond");
+  assert(resolved_method->signature()->equals(selected_method->signature()), "signatures must correspond");
   _resolved_klass  = resolved_klass;
   _selected_klass  = selected_klass;
   _resolved_method = resolved_method;
@@ -168,10 +168,10 @@
     // Ensure that this is really the case.
     KlassHandle object_klass = SystemDictionary::Object_klass();
     Method * object_resolved_method = object_klass()->vtable()->method_at(index);
-    assert(object_resolved_method->name() == resolved_method->name(),
+    assert(object_resolved_method->name()->equals(resolved_method->name()),
       err_msg("Object and interface method names should match at vtable index %d, %s != %s",
       index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()));
-    assert(object_resolved_method->signature() == resolved_method->signature(),
+    assert(object_resolved_method->signature()->equals(resolved_method->signature()),
       err_msg("Object and interface method signatures should match at vtable index %d, %s != %s",
       index, object_resolved_method->signature()->as_C_string(), resolved_method->signature()->as_C_string()));
 #endif // ASSERT
@@ -462,7 +462,7 @@
   //
   // We'll check for the method name first, as that's most likely
   // to be false (so we'll short-circuit out of these tests).
-  if (sel_method->name() == vmSymbols::clone_name() &&
+  if (sel_method->name()->equals(vmSymbols::clone_name()) &&
       sel_klass() == SystemDictionary::Object_klass() &&
       resolved_klass->oop_is_array()) {
     // We need to change "protected" to "public".
@@ -900,7 +900,7 @@
   } else {
     resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, false, CHECK);
   }
-  assert(resolved_method->name() != vmSymbols::class_initializer_name(), "should have been checked in verifier");
+  assert(resolved_method->name()->not_equals(vmSymbols::class_initializer_name()), "should have been checked in verifier");
 
   // check if static
   if (!resolved_method->is_static()) {
@@ -940,7 +940,7 @@
   }
 
   // check if method name is <init>, that it is found in same klass as static type
-  if (resolved_method->name() == vmSymbols::object_initializer_name() &&
+  if (resolved_method->name()->equals(vmSymbols::object_initializer_name()) &&
       resolved_method->method_holder() != resolved_klass()) {
     ResourceMark rm(THREAD);
     Exceptions::fthrow(
@@ -1034,7 +1034,7 @@
         current_klass->is_subclass_of(resolved_klass()) &&
         current_klass() != resolved_klass() &&
         // c) check if the method is not <init>
-        resolved_method->name() != vmSymbols::object_initializer_name()) {
+        resolved_method->name()->not_equals(vmSymbols::object_initializer_name())) {
       // Lookup super method
       KlassHandle super_klass(THREAD, current_klass->super());
       lookup_instance_method_in_klasses(sel_method, super_klass,
@@ -1108,8 +1108,8 @@
   // normal method resolution
   resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, true, CHECK);
 
-  assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
-  assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier");
+  assert(resolved_method->name()->not_equals(vmSymbols::object_initializer_name()), "should have been checked in verifier");
+  assert(resolved_method->name()->not_equals(vmSymbols::class_initializer_name ()), "should have been checked in verifier");
 
   // check if private interface method
   if (resolved_klass->is_interface() && resolved_method->is_private()) {
@@ -1264,8 +1264,8 @@
   // normal interface method resolution
   resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, true, CHECK);
 
-  assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
-  assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier");
+  assert(resolved_method->name()->not_equals(vmSymbols::object_initializer_name()), "should have been checked in verifier");
+  assert(resolved_method->name()->not_equals(vmSymbols::class_initializer_name ()), "should have been checked in verifier");
 }
 
 // throws runtime exceptions