src/share/vm/c1/c1_Runtime1.cpp

*** 806,816 ****
        case Bytecodes::_putstatic:
        case Bytecodes::_getstatic:
          { klassOop klass = resolve_field_return_klass(caller_method, bci, CHECK);
            // Save a reference to the class that has to be checked for initialization
            init_klass = KlassHandle(THREAD, klass);
!           k = klass;
          }
          break;
        case Bytecodes::_new:
          { Bytecode_new bnew(caller_method(), caller_method->bcp_from(bci));
            k = caller_method->constants()->klass_at(bnew.index(), CHECK);
--- 806,816 ----
        case Bytecodes::_putstatic:
        case Bytecodes::_getstatic:
          { klassOop klass = resolve_field_return_klass(caller_method, bci, CHECK);
            // Save a reference to the class that has to be checked for initialization
            init_klass = KlassHandle(THREAD, klass);
!           k = klass->java_mirror();
          }
          break;
        case Bytecodes::_new:
          { Bytecode_new bnew(caller_method(), caller_method->bcp_from(bci));
            k = caller_method->constants()->klass_at(bnew.index(), CHECK);