Automerge master into ibm_sdk 2017-10-25-19:43:46

eclipse-openj9 · Oct 25, 2017 · 338c5b9 · 338c5b9
2 parents 98c1ffc + 1fd49aa
commit 338c5b9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/runtime/tr.source/trj9/z/codegen/ReduceSynchronizedFieldLoad.cpp b/runtime/tr.source/trj9/z/codegen/ReduceSynchronizedFieldLoad.cpp
@@ -263,9 +263,14 @@ ReduceSynchronizedFieldLoad::perform()
       {
       if (!cg->comp()->getOption(TR_DisableSynchronizedFieldLoad))
          {
-         traceMsg(cg->comp(), "Performing ReduceSynchronizedFieldLoad\n");
+         static const bool enableReduceSynchronizedFieldLoad = feGetEnv("TR_EnableReduceSynchronizedFieldLoad") != NULL;
 
-         transformed = performOnTreeTops(cg->comp()->getStartTree(), NULL);
+         if (enableReduceSynchronizedFieldLoad)
+            {
+            traceMsg(cg->comp(), "Performing ReduceSynchronizedFieldLoad\n");
+
+            transformed = performOnTreeTops(cg->comp()->getStartTree(), NULL);
+            }
          }
       }