src/cpu/x86/vm/c1_LIRGenerator_x86.cpp

rev 5190 : 8015107: NPG: Use consistent naming for metaspace concepts

*** 1237,1247 ****
    } else {
      stub = new SimpleExceptionStub(Runtime1::throw_class_cast_exception_id, obj.result(), info_for_exception);
    }
    LIR_Opr reg = rlock_result(x);
    LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
!   if (!x->klass()->is_loaded() || UseCompressedKlassPointers) {
      tmp3 = new_register(objectType);
    }
    __ checkcast(reg, obj.result(), x->klass(),
                 new_register(objectType), new_register(objectType), tmp3,
                 x->direct_compare(), info_for_exception, patching_info, stub,
--- 1237,1247 ----
    } else {
      stub = new SimpleExceptionStub(Runtime1::throw_class_cast_exception_id, obj.result(), info_for_exception);
    }
    LIR_Opr reg = rlock_result(x);
    LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
!   if (!x->klass()->is_loaded() || UseCompressedClassPointers) {
      tmp3 = new_register(objectType);
    }
    __ checkcast(reg, obj.result(), x->klass(),
                 new_register(objectType), new_register(objectType), tmp3,
                 x->direct_compare(), info_for_exception, patching_info, stub,
*** 1259,1269 ****
      // must do this before locking the destination register as an oop register
      patching_info = state_for(x, x->state_before());
    }
    obj.load_item();
    LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
!   if (!x->klass()->is_loaded() || UseCompressedKlassPointers) {
      tmp3 = new_register(objectType);
    }
    __ instanceof(reg, obj.result(), x->klass(),
                  new_register(objectType), new_register(objectType), tmp3,
                  x->direct_compare(), patching_info, x->profiled_method(), x->profiled_bci());
--- 1259,1269 ----
      // must do this before locking the destination register as an oop register
      patching_info = state_for(x, x->state_before());
    }
    obj.load_item();
    LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
!   if (!x->klass()->is_loaded() || UseCompressedClassPointers) {
      tmp3 = new_register(objectType);
    }
    __ instanceof(reg, obj.result(), x->klass(),
                  new_register(objectType), new_register(objectType), tmp3,
                  x->direct_compare(), patching_info, x->profiled_method(), x->profiled_bci());