Merge pull request #3162 from liqunl/vhfieldfolding

Fold static final fields that are VarHandle
eclipse-openj9 · Oct 9, 2018 · 60f29e8 · 60f29e8
2 parents 436de15 + 6b95a95
commit 60f29e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/compiler/compile/J9SymbolReferenceTable.cpp b/runtime/compiler/compile/J9SymbolReferenceTable.cpp
@@ -1378,7 +1378,7 @@ J9::SymbolReferenceTable::findOrCreateStaticSymbol(TR::ResolvedMethodSymbol * ow
          TR_OpaqueClassBlock *declaringClass = owningMethod->getDeclaringClassFromFieldOrStatic(comp(), cpIndex);
          if (declaringClass && fej9->isClassInitialized(declaringClass))
             {
-            static const char *foldVarHandle = feGetEnv("TR_FoldVarHandle");
+            static const char *dontFoldVarHandle = feGetEnv("TR_DontFoldVarHandle");
             int32_t clazzNameLength = 0;
             char *clazzName = fej9->getClassNameChars(declaringClass, clazzNameLength);
             bool createKnownObject = false;
@@ -1387,7 +1387,7 @@ J9::SymbolReferenceTable::findOrCreateStaticSymbol(TR::ResolvedMethodSymbol * ow
                {
                createKnownObject = true;
                }
-            else if ((foldVarHandle || comp()->getOption(TR_AggressiveOpts))
+            else if (!dontFoldVarHandle
                      && (clazzNameLength != 16 || strncmp(clazzName, "java/lang/System", 16)))
                {
                TR_OpaqueClassBlock *varHandleClass =  fej9->getSystemClassFromClassName("java/lang/invoke/VarHandle", 26);