Adaptions for JDK17.

openjdk-bots · Jun 5, 2024 · c2a9803 · c2a9803
1 parent 44e552e
commit c2a9803
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
@@ -4324,7 +4324,7 @@ Node* GraphKit::make_constant_from_field(ciField* field, Node* obj) {
 Node* GraphKit::maybe_narrow_object_type(Node* obj, ciKlass* type) {
   const TypeOopPtr* obj_type = obj->bottom_type()->isa_oopptr();
   const TypeOopPtr* sig_type = TypeOopPtr::make_from_klass(type);
-  if (obj_type != nullptr && sig_type->is_loaded() && !obj_type->higher_equal(sig_type)) {
+  if (obj_type != nullptr && sig_type->klass()->is_loaded() && !obj_type->higher_equal(sig_type)) {
     const Type* narrow_obj_type = obj_type->filter_speculative(sig_type); // keep speculative part
     Node* casted_obj = gvn().transform(new CheckCastPPNode(control(), obj, narrow_obj_type));
     return casted_obj;

diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java
@@ -41,7 +41,7 @@ public class TestMHUnloadedHelper {
     static byte[] generateClassFile(Class<?> caller) {
         var cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         String name = caller.getName().replace('.', '/');
-        cw.visit(V19, ACC_PUBLIC | ACC_SUPER, name, null, "java/lang/Object", null);
+        cw.visit(V17, ACC_PUBLIC | ACC_SUPER, name, null, "java/lang/Object", null);
         {
             var mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "test", METHOD_TYPE.toMethodDescriptorString(), null, null);
             mv.visitCode();