Avoid OOL instruction generation during OOM on X86

OutlinedInstructionsGenerator to not generate instructions when there is a uncaught exception. Signed-off-by: Victor Ding <dvictor@ca.ibm.com>
eclipse · Oct 18, 2018 · c53a0aa · c53a0aa
1 parent ea548a6
commit c53a0aa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/compiler/x/codegen/OutlinedInstructions.cpp b/compiler/x/codegen/OutlinedInstructions.cpp
@@ -381,6 +381,9 @@ TR_OutlinedInstructionsGenerator::TR_OutlinedInstructionsGenerator(TR::LabelSymb
 
 TR_OutlinedInstructionsGenerator::~TR_OutlinedInstructionsGenerator()
    {
-   generateLabelInstruction(LABEL, _oi->_callNode, generateLabelSymbol(_oi->_cg), _oi->_cg);
-   _oi->swapInstructionListsWithCompilation();
+   if (!std::uncaught_exception())
+      {
+      generateLabelInstruction(LABEL, _oi->_callNode, generateLabelSymbol(_oi->_cg), _oi->_cg);
+      _oi->swapInstructionListsWithCompilation();
+      }
    }