diff --git a/runtime/compiler/optimizer/J9CFGSimplifier.cpp b/runtime/compiler/optimizer/J9CFGSimplifier.cpp index daa9c96f9a5..c00e423528e 100644 --- a/runtime/compiler/optimizer/J9CFGSimplifier.cpp +++ b/runtime/compiler/optimizer/J9CFGSimplifier.cpp @@ -34,8 +34,8 @@ bool J9::CFGSimplifier::simplifyIfPatterns(bool needToDuplicateTree) { - static char *enableCFGSimplification = feGetEnv("TR_enableCFGSimplificaiton"); - if (enableCFGSimplification == NULL) + static const char *disableCFGSimplification = feGetEnv("TR_disableCFGSimplification"); + if (disableCFGSimplification != NULL) return false; return OMR::CFGSimplifier::simplifyIfPatterns(needToDuplicateTree) @@ -71,9 +71,9 @@ bool J9::CFGSimplifier::simplifyIfPatterns(bool needToDuplicateTree) bool J9::CFGSimplifier::simplifyUnresolvedRequireNonNull(bool needToDuplicateTree) { - static char *disableSimplifyExplicitNULLTest = feGetEnv("TR_disableSimplifyExplicitNULLTest"); - static char *disableSimplifyUnresolvedRequireNonNull = feGetEnv("TR_disableSimplifyUnresolvedRequireNonNull"); - if (disableSimplifyExplicitNULLTest != NULL || disableSimplifyUnresolvedRequireNonNull != NULL) + static const char *enableSimplifyExplicitNULLTest = feGetEnv("TR_enableSimplifyExplicitNULLTest"); + static const char *enableSimplifyUnresolvedRequireNonNull = feGetEnv("TR_enableSimplifyUnresolvedRequireNonNull"); + if (enableSimplifyExplicitNULLTest == NULL || enableSimplifyUnresolvedRequireNonNull == NULL) return false; if (comp()->getOSRMode() == TR::involuntaryOSR) @@ -242,9 +242,9 @@ bool J9::CFGSimplifier::simplifyUnresolvedRequireNonNull(bool needToDuplicateTre // bool J9::CFGSimplifier::simplifyResolvedRequireNonNull(bool needToDuplicateTree) { - static char *disableSimplifyExplicitNULLTest = feGetEnv("TR_disableSimplifyExplicitNULLTest"); - static char *disableSimplifyResolvedRequireNonNull = feGetEnv("TR_disableSimplifyResolvedRequireNonNull"); - if (disableSimplifyExplicitNULLTest != NULL || disableSimplifyResolvedRequireNonNull != NULL) + static const char *enableSimplifyExplicitNULLTest = feGetEnv("TR_enableSimplifyExplicitNULLTest"); + static const char *enableSimplifyResolvedRequireNonNull = feGetEnv("TR_enableSimplifyResolvedRequireNonNull"); + if (enableSimplifyExplicitNULLTest == NULL || enableSimplifyResolvedRequireNonNull == NULL) return false; if (comp()->getOSRMode() == TR::involuntaryOSR)