Merge pull request #3031 from yanluo7/condy_fix

Ensure staticName() symbols represent static fields
eclipse-omr · Oct 6, 2018 · e800d76 · e800d76
2 parents bd633e4 + 2522870
commit e800d76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler/optimizer/OMRValuePropagation.cpp b/compiler/optimizer/OMRValuePropagation.cpp
@@ -7923,7 +7923,7 @@ void OMR::ValuePropagation::doDelayedTransformations()
       bool recognizedStatic = false;
 
       if ((origFirst->getOpCodeValue() == TR::aload) &&
-          origFirst->getSymbol()->isStatic())
+          origFirst->getSymbol()->isStaticField())
          {
          int32_t staticNameLen = -1;
          char *staticName = NULL;

diff --git a/compiler/optimizer/VPHandlers.cpp b/compiler/optimizer/VPHandlers.cpp
@@ -2617,7 +2617,7 @@ TR::Node *constrainIaload(OMR::ValuePropagation *vp, TR::Node *node)
                      int32_t fieldNameLen = -1;
                      char *fieldName = NULL;
                      if (underlyingArray && underlyingArray->getOpCode().hasSymbolReference() &&
-                         (underlyingArray->getSymbolReference()->getSymbol()->isStatic() ||
+                         (underlyingArray->getSymbolReference()->getSymbol()->isStaticField() ||
                            underlyingArray->getSymbolReference()->getSymbol()->isShadow()))
                         {
                         if (underlyingArray->getSymbolReference()->getSymbol()->isShadow())