src/share/vm/ci/ciField.cpp

*** 210,222 ****
      //    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.
  
!     klassOop 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() ||
            _offset == java_lang_System::err_offset_in_bytes() ) {
          _is_constant = false;
--- 210,222 ----
      //    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() ||
            _offset == java_lang_System::err_offset_in_bytes() ) {
          _is_constant = false;