Merge pull request #2807 from cathyzhyi/fixcaseconvert

Fix supportsIntrinsicCaseConversion in ilgen
eclipse-openj9 · Sep 10, 2018 · df38a58 · df38a58
2 parents 931613c + 9964c14
commit df38a58
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/runtime/compiler/ilgen/Walker.cpp b/runtime/compiler/ilgen/Walker.cpp
@@ -4643,13 +4643,6 @@ TR_J9ByteCodeIlGenerator::genInvoke(TR::SymbolReference * symRef, TR::Node *indi
 
     */
 
-
-   TR::Node * savedNode = NULL;
-   if (_stack->topIndex() > 0)
-      {
-      savedNode = _stack->element(_stack->topIndex());
-      }
-
 #define DAA_PRINT(a) \
 case a: \
    traceMsg(comp(), "DAA Method found: %s\n", #a); \
@@ -4955,7 +4948,12 @@ break
        return NULL;
        }
 
-    int32_t constToLoad = 0;
+   if (symbol->getRecognizedMethod() == TR::com_ibm_jit_JITHelpers_supportsIntrinsicCaseConversion)
+      {
+      pop(); //pop the receiver since it's not used
+      loadConstant(TR::iconst, cg()->getSupportsInlineStringCaseConversion() ? 1 : 0);
+      return NULL;
+      }
 
    if (!isStatic && _classInfo && !symRef->isUnresolved())
       {
@@ -5064,17 +5062,6 @@ break
          }
       }
 
-   if(symbol->getRecognizedMethod() == TR::com_ibm_jit_JITHelpers_supportsIntrinsicCaseConversion)
-      {
-      if (cg()->getSupportsInlineStringCaseConversion())
-         constToLoad = 1;
-      else
-         constToLoad  = 0; // should already be 0 but just incase..
-
-      loadConstant(TR::iconst, constToLoad);
-      return NULL;
-      }
-
    if (cg()->getSupportsInlineStringCaseConversion() &&
          (symbol->getRecognizedMethod() == TR::com_ibm_jit_JITHelpers_toUpperIntrinsicLatin1 ||
             symbol->getRecognizedMethod() == TR::com_ibm_jit_JITHelpers_toLowerIntrinsicLatin1 ||