Merge pull request #22062 from mpirvu/knot

jdmpapin · web-flow · commit 0cf42bd12061 · 2025-06-10T09:29:21.000-04:00
Fix crash with -Xjit:disableKnownObjectTable
diff --git a/runtime/compiler/optimizer/J9TransformUtil.cpp b/runtime/compiler/optimizer/J9TransformUtil.cpp
@@ -2178,6 +2178,9 @@ J9::TransformUtil::transformIndirectLoadChainImpl(TR::Compilation *comp,
             }
          else if (symRef->getSymbol()->isCollectedReference())
             {
+            TR::KnownObjectTable *knot = comp->getOrCreateKnownObjectTable();
+            if (!knot)
+               return false;
             TR::KnownObjectTable::Index knotIndex = TR::KnownObjectTable::UNKNOWN;
 #if defined(J9VM_OPT_JITSERVER)
             if (isServer)
@@ -2214,7 +2217,6 @@ J9::TransformUtil::transformIndirectLoadChainImpl(TR::Compilation *comp,
 
                   if (stableArrayRank > 0)
                      {
-                     TR::KnownObjectTable *knot = comp->getOrCreateKnownObjectTable();
                      knot->addStableArray(improvedSymRef->getKnownObjectIndex(), stableArrayRank);
                      }
                   }

Original file line number	Diff line number	Diff line change
`@@ -2178,6 +2178,9 @@ J9::TransformUtil::transformIndirectLoadChainImpl(TR::Compilation *comp,`
`2178`	`2178`	`}`
`2179`	`2179`	`else if (symRef->getSymbol()->isCollectedReference())`
`2180`	`2180`	`{`
	`2181`	`+ TR::KnownObjectTable *knot = comp->getOrCreateKnownObjectTable();`
	`2182`	`+ if (!knot)`
	`2183`	`+ return false;`
`2181`	`2184`	`TR::KnownObjectTable::Index knotIndex = TR::KnownObjectTable::UNKNOWN;`
`2182`	`2185`	`#if defined(J9VM_OPT_JITSERVER)`
`2183`	`2186`	`if (isServer)`
`@@ -2214,7 +2217,6 @@ J9::TransformUtil::transformIndirectLoadChainImpl(TR::Compilation *comp,`
`2214`	`2217`
`2215`	`2218`	`if (stableArrayRank > 0)`
`2216`	`2219`	`{`
`2217`		`- TR::KnownObjectTable *knot = comp->getOrCreateKnownObjectTable();`
`2218`	`2220`	`knot->addStableArray(improvedSymRef->getKnownObjectIndex(), stableArrayRank);`
`2219`	`2221`	`}`
`2220`	`2222`	`}`