src/share/vm/c1/c1_GraphBuilder.cpp

*** 1469,1481 ****
  
    Value obj = NULL;
    if (code == Bytecodes::_getstatic || code == Bytecodes::_putstatic) {
      if (state_before != NULL) {
        // build a patching constant
!       obj = new Constant(new ClassConstant(holder), state_before);
      } else {
!       obj = new Constant(new ClassConstant(holder));
      }
    }
  
  
    const int offset = !needs_patching ? field->offset() : -1;
--- 1469,1481 ----
  
    Value obj = NULL;
    if (code == Bytecodes::_getstatic || code == Bytecodes::_putstatic) {
      if (state_before != NULL) {
        // build a patching constant
!       obj = new Constant(new InstanceConstant(holder->java_mirror()), state_before);
      } else {
!       obj = new Constant(new InstanceConstant(holder->java_mirror()));
      }
    }
  
  
    const int offset = !needs_patching ? field->offset() : -1;