src/share/vm/ci/ciField.cpp

*** 210,220 ****
      //    field to be not constant.
      // 2. The field is a *special* static&final field whose value
      //    may change.  The three examples are java.lang.System.in,
      //    java.lang.System.out, and java.lang.System.err.
  
!     Handle k = _holder->get_klassOop();
      assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
      if( k() == SystemDictionary::System_klass() ) {
        // Check offsets for case 2: System.in, System.out, or System.err
        if( _offset == java_lang_System::in_offset_in_bytes()  ||
            _offset == java_lang_System::out_offset_in_bytes() ||
--- 210,220 ----
      //    field to be not constant.
      // 2. The field is a *special* static&final field whose value
      //    may change.  The three examples are java.lang.System.in,
      //    java.lang.System.out, and java.lang.System.err.
  
!     KlassHandle k = _holder->get_klassOop();
      assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
      if( k() == SystemDictionary::System_klass() ) {
        // Check offsets for case 2: System.in, System.out, or System.err
        if( _offset == java_lang_System::in_offset_in_bytes()  ||
            _offset == java_lang_System::out_offset_in_bytes() ||
*** 222,232 ****
          _is_constant = false;
          return;
        }
      }
  
!     oop mirror = k->java_mirror();
  
      _is_constant = true;
      switch(type()->basic_type()) {
      case T_BYTE:
        _constant_value = ciConstant(type()->basic_type(), mirror->byte_field(_offset));
--- 222,232 ----
          _is_constant = false;
          return;
        }
      }
  
!     Handle mirror = k->java_mirror();
  
      _is_constant = true;
      switch(type()->basic_type()) {
      case T_BYTE:
        _constant_value = ciConstant(type()->basic_type(), mirror->byte_field(_offset));