27
27
#include " jvm.h"
28
28
#include " asm/macroAssembler.inline.hpp"
29
29
#include " classfile/javaClasses.inline.hpp"
30
+ #include " classfile/vmClasses.hpp"
30
31
#include " interpreter/interpreter.hpp"
31
32
#include " logging/log.hpp"
32
33
#include " logging/logStream.hpp"
@@ -56,7 +57,7 @@ inline static RegisterOrConstant constant(int value) {
56
57
void MethodHandles::load_klass_from_Class (MacroAssembler* _masm, Register klass_reg,
57
58
Register temp_reg, Register temp2_reg) {
58
59
if (VerifyMethodHandles) {
59
- verify_klass (_masm, klass_reg, SystemDictionary::WK_KLASS_ENUM_NAME (java_lang_Class),
60
+ verify_klass (_masm, klass_reg, VM_CLASS_ID (java_lang_Class),
60
61
temp_reg, temp2_reg, " MH argument is a Class" );
61
62
}
62
63
__ ld (klass_reg, java_lang_Class::klass_offset (), klass_reg);
@@ -74,11 +75,11 @@ static int check_nonzero(const char* xname, int x) {
74
75
75
76
#ifdef ASSERT
76
77
void MethodHandles::verify_klass (MacroAssembler* _masm,
77
- Register obj_reg, SystemDictionary::WKID klass_id,
78
+ Register obj_reg, VMClassID klass_id,
78
79
Register temp_reg, Register temp2_reg,
79
80
const char * error_message) {
80
- InstanceKlass** klass_addr = SystemDictionary::well_known_klass_addr (klass_id);
81
- Klass* klass = SystemDictionary::well_known_klass (klass_id);
81
+ InstanceKlass** klass_addr = VMClassses::klass_addr_at (klass_id);
82
+ Klass* klass = VMClassses::klass_at (klass_id);
82
83
Label L_ok, L_bad;
83
84
BLOCK_COMMENT (" verify_klass {" );
84
85
__ verify_oop (obj_reg, FILE_AND_LINE);
@@ -325,7 +326,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
325
326
// The method is a member invoker used by direct method handles.
326
327
if (VerifyMethodHandles) {
327
328
// make sure the trailing argument really is a MemberName (caller responsibility)
328
- verify_klass (_masm, member_reg, SystemDictionary::WK_KLASS_ENUM_NAME (MemberName_klass),
329
+ verify_klass (_masm, member_reg, VM_CLASS_ID (MemberName_klass),
329
330
temp1, temp2,
330
331
" MemberName required for invokeVirtual etc." );
331
332
}
0 commit comments