Backport 7652f9811bfddf08650b0c3277012074873deade

TheRealMDoerr · Jun 7, 2024 · 234ffd8 · 234ffd8
1 parent 17d65fe
commit 234ffd8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
@@ -3720,24 +3720,24 @@ const TypeInstPtr *TypeInstPtr::xmeet_unloaded(const TypeInstPtr *tinst) const {
       //
       assert(loaded->ptr() != TypePtr::Null, "insanity check");
       //
-      if(      loaded->ptr() == TypePtr::TopPTR ) { return unloaded; }
+      if(      loaded->ptr() == TypePtr::TopPTR ) { return unloaded->with_speculative(speculative); }
       else if (loaded->ptr() == TypePtr::AnyNull) { return TypeInstPtr::make(ptr, unloaded->klass(), false, nullptr, off, instance_id, speculative, depth); }
-      else if (loaded->ptr() == TypePtr::BotPTR ) { return TypeInstPtr::BOTTOM; }
+      else if (loaded->ptr() == TypePtr::BotPTR ) { return TypeInstPtr::BOTTOM->with_speculative(speculative); }
       else if (loaded->ptr() == TypePtr::Constant || loaded->ptr() == TypePtr::NotNull) {
-        if (unloaded->ptr() == TypePtr::BotPTR  ) { return TypeInstPtr::BOTTOM;  }
-        else                                      { return TypeInstPtr::NOTNULL; }
+        if (unloaded->ptr() == TypePtr::BotPTR  ) { return TypeInstPtr::BOTTOM->with_speculative(speculative);  }
+        else                                      { return TypeInstPtr::NOTNULL->with_speculative(speculative); }
       }
-      else if( unloaded->ptr() == TypePtr::TopPTR )  { return unloaded; }
+      else if( unloaded->ptr() == TypePtr::TopPTR )  { return unloaded->with_speculative(speculative); }
 
-      return unloaded->cast_to_ptr_type(TypePtr::AnyNull)->is_instptr();
+      return unloaded->cast_to_ptr_type(TypePtr::AnyNull)->is_instptr()->with_speculative(speculative);
     }
 
     // Both are unloaded, not the same class, not Object
     // Or meet unloaded with a different loaded class, not java/lang/Object
     if( ptr != TypePtr::BotPTR ) {
-      return TypeInstPtr::NOTNULL;
+      return TypeInstPtr::NOTNULL->with_speculative(speculative);
     }
-    return TypeInstPtr::BOTTOM;
+    return TypeInstPtr::BOTTOM->with_speculative(speculative);
 }
 
 
@@ -4124,6 +4124,10 @@ const Type *TypeInstPtr::remove_speculative() const {
               _instance_id, nullptr, _inline_depth);
 }
 
+const TypeInstPtr* TypeInstPtr::with_speculative(const TypePtr* speculative) const {
+  return make(_ptr, klass(), klass_is_exact(), const_oop(), _offset, _instance_id, speculative, _inline_depth);
+}
+
 const TypePtr *TypeInstPtr::with_inline_depth(int depth) const {
   if (!UseInlineDepthForSpeculativeTypes) {
     return this;

diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
@@ -1191,6 +1191,7 @@ class TypeInstPtr : public TypeOopPtr {
 
   // Speculative type helper methods.
   virtual const Type* remove_speculative() const;
+  const TypeInstPtr* with_speculative(const TypePtr* speculative) const;
   virtual const TypePtr* with_inline_depth(int depth) const;
   virtual const TypePtr* with_instance_id(int instance_id) const;
 

diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
@@ -31,9 +31,16 @@
  *
  * @compile TestMHUnloaded.java TestMHUnloadedHelper.java
  * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.runtime.unloaded.TestMHUnloadedHelper
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining
+ *                      compiler.runtime.unloaded.TestMHUnloaded
+ *
  * @run main/othervm -Xbootclasspath/a:.
  *                   -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline
  *                      compiler.runtime.unloaded.TestMHUnloaded
  */