Merge pull request #3603 from liqunl/fsd

Run OSR live range analysis and OSR def analysis first
eclipse-openj9 · Feb 26, 2019 · 53fdb04 · 53fdb04
2 parents e6c6285 + 8cee296
commit 53fdb04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/compiler/compile/OMRCompilation.cpp b/compiler/compile/OMRCompilation.cpp
@@ -840,6 +840,7 @@ OMR::Compilation::requiresAnalysisOSRPoint(TR::Node *node)
    if (!self()->isPotentialOSRPoint(node, &osrNode))
       {
       TR_ASSERT(0, "requiresAnalysisOSRPoint should only be called on OSR points\n");
+      return false;
       }
 
    // Calls require an analysis and transition point as liveness may change across them

diff --git a/compiler/optimizer/OMROptimizer.cpp b/compiler/optimizer/OMROptimizer.cpp
@@ -538,14 +538,14 @@ const OptimizationStrategy finalGlobalOpts[] =
 static const OptimizationStrategy ilgenStrategyOpts[] =
    {
 #ifdef J9_PROJECT_SPECIFIC
+   { osrLiveRangeAnalysis,          IfOSR   },
+   { osrDefAnalysis,                IfInvoluntaryOSR },
    { varHandleTransformer,          MustBeDone     },
    { unsafeFastPath                                },
    { recognizedCallTransformer                     },
    { coldBlockMarker                               },
    { allocationSinking,             IfNews         },
    { invariantArgumentPreexistence, IfNotClassLoadPhaseAndNotProfiling }, // Should not run if a recompilation is possible
-   { osrLiveRangeAnalysis,          IfOSR   },
-   { osrDefAnalysis,                IfInvoluntaryOSR },
 #endif
    { endOpts },
    };

diff --git a/compiler/optimizer/OSRDefAnalysis.cpp b/compiler/optimizer/OSRDefAnalysis.cpp
@@ -1403,6 +1403,8 @@ int32_t TR_OSRLiveRangeAnalysis::fullAnalysis(bool includeParms, bool containsPe
    vcount_t visitCount = comp()->incVisitCount();
    block = comp()->getStartBlock();
    _visitedBCI->empty();
+   int32_t callerIndex = comp()->getCurrentInlinedSiteIndex();
+
    while (block)
       {
       blockNum    = block->getNumber();
@@ -1507,8 +1509,9 @@ int32_t TR_OSRLiveRangeAnalysis::fullAnalysis(bool includeParms, bool containsPe
             && (comp()->isOSRTransitionTarget(TR::preExecutionOSR) || comp()->requiresAnalysisOSRPoint(node)))
             {
             TR_ByteCodeInfo bcInfo = node->getByteCodeInfo();
+            TR_ASSERT_FATAL(bcInfo.getCallerIndex() == callerIndex, "Found node with invalid caller index");
             TR_OSRPoint *osrPoint = comp()->getMethodSymbol()->findOSRPoint(bcInfo);
-            TR_ASSERT(osrPoint != NULL, "Cannot find a pre OSR point for node %p", node);
+            TR_ASSERT_FATAL(osrPoint != NULL, "Cannot find a pre OSR point for node %p", node);
 
             buildOSRLiveRangeInfo(node, _liveVars, osrPoint, liveLocalIndexToSymRefNumberMap,
                numBits, osrMethodData, containsPendingPushes);
@@ -1799,7 +1802,7 @@ void TR_OSRLiveRangeAnalysis::buildOSRLiveRangeInfo(TR::Node *node, TR_BitVector
             *deadSymRefs |= *_workDeadSymRefs; 
          }
 
-      if (newlyAllocated && !deadSymRefs->isEmpty())
+      if (newlyAllocated && deadSymRefs && !deadSymRefs->isEmpty())
          osrMethodData->addLiveRangeInfo(byteCodeIndex, deadSymRefs);
       }