Merge pull request #4324 from 0dvictor/unresolved64

Respect resolving static method low-tag on X86-64
eclipse-openj9 · Jan 17, 2019 · c1d6f09 · c1d6f09
2 parents 6b6c2c8 + b4d4319
commit c1d6f09
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/runtime/compiler/x/runtime/X86Unresolveds.nasm b/runtime/compiler/x/runtime/X86Unresolveds.nasm
@@ -1231,18 +1231,22 @@ interpreterUnresolvedStaticGlue:
       push        rsi                                       ; The RET will mispredict anyway so we can get away with pushing 
                                                             ; the adjusted RA back on the stack.
 
-      ; The interpreter may low-tag the result to avoid populating the constant pool--whack it.
+      ; The interpreter may low-tag the result to avoid populating the constant pool -- whack it and record in CF.
       ;
-      and         rax, -2
+      btr         rax, 0
 
       ; Load the resolved RAM method into RDI so that the caller doesn't have to re-run patched code
       mov         rdi, rax
 
+      ; Skip code patching if the interpreter low-tag the RAM mathod
+      jc          .fin
+
       ; Patch the call that brought us here into a load of the resolved RAM method into RDI.
       ;
       shl         rax, 16
       xor         rax, 0bf48h                               ; REX+MOV bytes
       mov         qword [rsi-10], rax
+   .fin:
 ret