From 5e9133a8c89dc853fa43ffb33818d54b239367c6 Mon Sep 17 00:00:00 2001 From: Dhruv Chopra Date: Mon, 6 Jan 2020 12:58:04 -0500 Subject: [PATCH] Disable ResumableTraps when TR_DisableTraps option is set Signed-off-by: Dhruv Chopra --- compiler/p/codegen/OMRCodeGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/p/codegen/OMRCodeGenerator.cpp b/compiler/p/codegen/OMRCodeGenerator.cpp index 7eaf05fe34..66f2e40145 100644 --- 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(); /*