*** old/src/share/vm/classfile/javaClasses.cpp	Wed Apr 15 12:03:05 2015
--- new/src/share/vm/classfile/javaClasses.cpp	Wed Apr 15 12:03:05 2015

*** 532,542 ****
--- 532,542 ----
          break;
        case T_OBJECT:
          {
            #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);
          }
          break;

*** 1704,1715 ****
--- 1704,1715 ----
      // - 1 or more fillInStackTrace frames for the exception class (skipped)
      // - 0 or more <init> methods for the exception class (skipped)
      // - 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;
        }
        else {
          skip_fillInStackTrace_check = true; // gone past them all

*** 1718,1728 ****
--- 1718,1728 ----
      if (!skip_throwableInit_check) {
        assert(skip_fillInStackTrace_check, "logic error in backtrace filtering");
  
        // 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 {
          // there are none or we've seen them all - either way stop checking
          skip_throwableInit_check = true;

*** 2929,2939 ****
--- 2929,2939 ----
    ResourceMark rm;
    stringStream buffer(128);
    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 {
      name = SymbolTable::new_symbol(sigstr, siglen, THREAD);
    }

*** 3611,3621 ****
--- 3611,3621 ----
    for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) {
      if (!may_be_java && !fs.access_flags().is_internal()) {
        // 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();
      }
    }
    ResourceMark rm;
    tty->print_cr("Invalid layout of %s at %s/%s%s", InstanceKlass::cast(klass_oop)->external_name(), name()->as_C_string(), signature()->as_C_string(), may_be_java ? " (may_be_java)" : "");