Merge pull request #4693 from dchopra001/disableTraps

Disable ResumableTraps when TR_DisableTraps option is set
eclipse-openj9 · Jan 6, 2020 · dafabc7 · dafabc7
2 parents ce7fdb2 + 5e9133a
commit dafabc7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/compiler/p/codegen/OMRCodeGenerator.cpp b/compiler/p/codegen/OMRCodeGenerator.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corp. and others
+ * Copyright (c) 2000, 2020 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -279,7 +279,7 @@ OMR::Power::CodeGenerator::CodeGenerator() :
    if (self()->comp()->target().isSMP())
       self()->setEnforceStoreOrder();
 
-   if (TR::Compiler->vm.hasResumableTrapHandler(self()->comp()))
+   if (!self()->comp()->getOption(TR_DisableTraps) && TR::Compiler->vm.hasResumableTrapHandler(self()->comp()))
       self()->setHasResumableTrapHandler();
 
    /*