--- old/src/share/vm/classfile/dictionary.cpp	2015-04-16 13:30:41.500056555 -0700
+++ new/src/share/vm/classfile/dictionary.cpp	2015-04-16 13:30:41.363046190 -0700
@@ -361,7 +361,7 @@
                            KlassHandle obj) {
   assert_locked_or_safepoint(SystemDictionary_lock);
   assert(obj() != NULL, "adding NULL obj");
-  assert(obj()->name() == class_name, "sanity check on name");
+  assert(obj()->name()->equals(class_name), "sanity check on name");
   assert(loader_data != NULL, "Must be non-NULL");
 
   unsigned int hash = compute_hash(class_name, loader_data);
@@ -663,7 +663,7 @@
                                                      intptr_t sym_mode) {
   assert(index == index_for(sym, sym_mode), "incorrect index?");
   for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) {
-    if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) {
+    if (p->hash() == hash && p->symbol()->equals(sym) && p->symbol_mode() == sym_mode) {
       return p;
     }
   }