--- old/src/share/vm/interpreter/rewriter.cpp	2015-04-16 13:30:50.013700555 -0700
+++ new/src/share/vm/interpreter/rewriter.cpp	2015-04-16 13:30:49.879690418 -0700
@@ -54,7 +54,7 @@
         add_resolved_references_entry(i);
         break;
       case JVM_CONSTANT_Utf8:
-        if (_pool->symbol_at(i) == vmSymbols::java_lang_invoke_MethodHandle())
+        if (_pool->symbol_at(i)->equals(vmSymbols::java_lang_invoke_MethodHandle()))
           saw_mh_symbol = true;
         break;
     }
@@ -194,7 +194,7 @@
       int status = _method_handle_invokers[cp_index];
       assert(status >= -1 && status <= 1, "oob tri-state");
       if (status == 0) {
-        if (_pool->klass_ref_at_noresolve(cp_index) == vmSymbols::java_lang_invoke_MethodHandle() &&
+        if (_pool->klass_ref_at_noresolve(cp_index)->equals(vmSymbols::java_lang_invoke_MethodHandle()) &&
             MethodHandles::is_signature_polymorphic_name(SystemDictionary::MethodHandle_klass(),
                                                          _pool->name_ref_at(cp_index))) {
           // we may need a resolved_refs entry for the appendix
@@ -460,7 +460,7 @@
   // determine index maps for Method* rewriting
   compute_index_maps();
 
-  if (RegisterFinalizersAtInit && _klass->name() == vmSymbols::java_lang_Object()) {
+  if (RegisterFinalizersAtInit && _klass->name()->equals(vmSymbols::java_lang_Object())) {
     bool did_rewrite = false;
     int i = _methods->length();
     while (i-- > 0) {