--- old/src/share/vm/classfile/javaClasses.cpp	2015-04-15 12:03:05.277578094 -0700
+++ new/src/share/vm/classfile/javaClasses.cpp	2015-04-15 12:03:05.129567743 -0700
@@ -534,7 +534,7 @@
         {
           #ifdef ASSERT
           TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK);
-          assert(fd->signature() == sym, "just checking");
+          assert(fd->signature()->equals(sym), "just checking");
           #endif
           oop string = fd->string_initial_value(CHECK);
           mirror()->obj_field_put(fd->offset(), string);
@@ -1706,8 +1706,8 @@
     // - rest of the stack
 
     if (!skip_fillInStackTrace_check) {
-      if ((method->name() == vmSymbols::fillInStackTrace_name() ||
-           method->name() == vmSymbols::fillInStackTrace0_name()) &&
+      if ((method->name()->equals(vmSymbols::fillInStackTrace_name()) ||
+           method->name()->equals(vmSymbols::fillInStackTrace0_name())) &&
           throwable->is_a(method->method_holder())) {
         continue;
       }
@@ -1720,7 +1720,7 @@
 
       // skip <init> methods of the exception class and superclasses
       // This is simlar to classic VM.
-      if (method->name() == vmSymbols::object_initializer_name() &&
+      if (method->name()->equals(vmSymbols::object_initializer_name()) &&
           throwable->is_a(method->method_holder())) {
         continue;
       } else {
@@ -2931,7 +2931,7 @@
   print_signature(mt, &buffer);
   const char* sigstr =       buffer.base();
   int         siglen = (int) buffer.size();
-  Symbol *name;
+  Symbol* name;
   if (!intern_if_not_found) {
     name = SymbolTable::probe(sigstr, siglen);
   } else {
@@ -3475,7 +3475,7 @@
   Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH);
   instanceKlassHandle h_klass (THREAD, k);
   TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH);
-  TempNewSymbol f_sig  = SymbolTable::new_symbol(field_sig, CATCH);
+  TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH);
   if (!h_klass->find_local_field(f_name, f_sig, &fd)) {
     tty->print_cr("Static field %s.%s not found", klass_name, field_name);
     return false;
@@ -3613,7 +3613,7 @@
       // Only look at injected fields
       continue;
     }
-    if (fs.name() == name() && fs.signature() == signature()) {
+    if (fs.name()->equals(name()) && fs.signature()->equals(signature())) {
       return fs.offset();
     }
   }