Merge pull request #16392 from rmnattas/p-missingLabel-fix

Check sequence boundary before generating next sequence transition
eclipse-openj9 · Dec 4, 2022 · e58fc3a · e58fc3a
2 parents d1e10d8 + 0a09957
commit e58fc3a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/runtime/compiler/p/codegen/J9TreeEvaluator.cpp b/runtime/compiler/p/codegen/J9TreeEvaluator.cpp
@@ -4090,15 +4090,14 @@ TR::Register *J9::Power::TreeEvaluator::VMinstanceOfEvaluator(TR::Node *node, TR
             break;
          }
 
-      genInstanceOfTransitionToNextSequence(node, iter, nextSequenceLabel, doneLabel, cr0Reg, resultReg, initialResult, oppositeResultLabel, profiledClassIsInstanceOf, cg);
-
-      --numSequencesRemaining;
-      ++iter;
-
-      if (*iter != HelperCall)
+      if (--numSequencesRemaining > 0)
          {
-         generateLabelInstruction(cg, TR::InstOpCode::label, node, nextSequenceLabel);
-         nextSequenceLabel = generateLabelSymbol(cg);
+         genInstanceOfTransitionToNextSequence(node, iter, nextSequenceLabel, doneLabel, cr0Reg, resultReg, initialResult, oppositeResultLabel, profiledClassIsInstanceOf, cg);
+         if (*++iter != HelperCall)
+            {
+            generateLabelInstruction(cg, TR::InstOpCode::label, node, nextSequenceLabel);
+            nextSequenceLabel = generateLabelSymbol(cg);
+            }
          }
       }