Review fixes

Author: gbalykov

src/inc/stdmacros.h

@@ -87,14 +87,12 @@
 #ifdef _TARGET_ARM_
 #define ARM_FIRST_ARG(x)  x ,
 #define ARM_ARG(x)        , x
-#define ARM_ARG_OR_ZERO(x) , x
 #define ARM_ONLY(x)       x
 #define NOT_ARM(x)
 #define NOT_ARM_ARG(x)
 #else
 #define ARM_FIRST_ARG(x)
 #define ARM_ARG(x)
-#define ARM_ARG_OR_ZERO(x) , 0
 #define ARM_ONLY(x)
 #define NOT_ARM(x)        x
 #define NOT_ARM_ARG(x)    , x

src/jit/codegencommon.cpp

@@ -8600,6 +8600,19 @@ void CodeGen::genFnEpilog(BasicBlock* block)
 
     bool jmpEpilog = ((block->bbFlags & BBF_HAS_JMP) != 0);
 
+    GenTree* lastNode = block->lastNode();
+
+    // Method handle and address info used in case of jump epilog
+    CORINFO_METHOD_HANDLE methHnd = nullptr;
+    CORINFO_CONST_LOOKUP  addrInfo;
+    addrInfo.addr = nullptr;
+
+    if (jmpEpilog && lastNode->gtOper == GT_JMP)
+    {
+        methHnd = (CORINFO_METHOD_HANDLE)lastNode->gtVal.gtVal1;
+        compiler->info.compCompHnd->getFunctionEntryPoint(methHnd, &addrInfo);
+    }
+
 #ifdef _TARGET_ARM_
     // We delay starting the unwind codes until we have an instruction which we know
     // needs an unwind code. In particular, for large stack frames in methods without
@@ -8644,12 +8657,11 @@ void CodeGen::genFnEpilog(BasicBlock* block)
         unwindStarted = true;
     }
 
-#ifdef FEATURE_NGEN_RELOCS_OPTIMIZATIONS
-#if !FEATURE_FASTTAILCALL
-    if (jmpEpilog)
+    if (jmpEpilog && lastNode->gtOper == GT_JMP
+        && addrInfo.accessType == IAT_RELPVALUE)
     {
-        // In case of FEATURE_NGEN_RELOCS_OPTIMIZATIONS and IAT_RELPVALUE jump at the end is done using
-        // relative indirection, so, additional helper register is required.
+        // IAT_RELPVALUE jump at the end is done using relative indirection, so,
+        // additional helper register is required.
         // We use LR just before it is going to be restored from stack, i.e.
         //
         //     movw r12, laddr
@@ -8661,27 +8673,14 @@ void CodeGen::genFnEpilog(BasicBlock* block)
         //     ...
         //     bx r12
 
-        GenTree* jmpNode = block->lastNode();
-
-        noway_assert(jmpNode->gtOper == GT_JMP);
+        regNumber indCallReg = REG_R12;
+        regNumber vptrReg1   = REG_LR;
 
-        CORINFO_METHOD_HANDLE methHnd = (CORINFO_METHOD_HANDLE)jmpNode->gtVal.gtVal1;
-        CORINFO_CONST_LOOKUP  addrInfo;
-        compiler->info.compCompHnd->getFunctionEntryPoint(methHnd, &addrInfo);
-
-        if (addrInfo.accessType == IAT_RELPVALUE)
-        {
-            regNumber indCallReg = REG_R12;
-            regNumber vptrReg1   = REG_LR;
-
-            instGen_Set_Reg_To_Imm(EA_HANDLE_CNS_RELOC, indCallReg, (ssize_t)addrInfo.addr);
-            getEmitter()->emitIns_R_R(INS_mov, EA_PTRSIZE, vptrReg1, indCallReg);
-            getEmitter()->emitIns_R_R_I(INS_ldr, EA_PTRSIZE, indCallReg, indCallReg, 0);
-            getEmitter()->emitIns_R_R(INS_add, EA_PTRSIZE, indCallReg, vptrReg1);
-        }
+        instGen_Set_Reg_To_Imm(EA_HANDLE_CNS_RELOC, indCallReg, (ssize_t)addrInfo.addr);
+        getEmitter()->emitIns_R_R(INS_mov, EA_PTRSIZE, vptrReg1, indCallReg);
+        getEmitter()->emitIns_R_R_I(INS_ldr, EA_PTRSIZE, indCallReg, indCallReg, 0);
+        getEmitter()->emitIns_R_R(INS_add, EA_PTRSIZE, indCallReg, vptrReg1);
     }
-#endif // !FEATURE_FASTTAILCALL
-#endif // FEATURE_NGEN_RELOCS_OPTIMIZATIONS
 
     genPopCalleeSavedRegisters(jmpEpilog);
 
@@ -8709,15 +8708,13 @@ void CodeGen::genFnEpilog(BasicBlock* block)
 
     if (jmpEpilog)
     {
-#ifdef _TARGET_ARMARCH_
         hasTailCalls = true;
-#endif // _TARGET_ARMARCH_
 
         noway_assert(block->bbJumpKind == BBJ_RETURN);
         noway_assert(block->bbTreeList != nullptr);
 
         /* figure out what jump we have */
-        GenTree* jmpNode = block->lastNode();
+        GenTree* jmpNode = lastNode;
 #if !FEATURE_FASTTAILCALL
         noway_assert(jmpNode->gtOper == GT_JMP);
 #else  // FEATURE_FASTTAILCALL
@@ -8736,10 +8733,8 @@ void CodeGen::genFnEpilog(BasicBlock* block)
         {
             // Simply emit a jump to the methodHnd. This is similar to a call so we can use
             // the same descriptor with some minor adjustments.
-            CORINFO_METHOD_HANDLE methHnd = (CORINFO_METHOD_HANDLE)jmpNode->gtVal.gtVal1;
-
-            CORINFO_CONST_LOOKUP addrInfo;
-            compiler->info.compCompHnd->getFunctionEntryPoint(methHnd, &addrInfo);
+            assert(methHnd != nullptr);
+            assert(addrInfo.addr != nullptr)
 
 #ifdef _TARGET_ARM_
             emitter::EmitCallType callType;

src/vm/methodtable.cpp

@@ -5057,7 +5057,7 @@ void MethodTable::Fixup(DataImage *image)
                     ZapNode * importThunk = image->GetVirtualImportThunk(pMD->GetMethodTable(), pMD, slotNumber);
                     // On ARM, make sure that the address to the virtual thunk that we write into the
                     // vtable "chunk" has the Thumb bit set.
-                    image->FixupFieldToNode(slotBase, slotOffset, importThunk ARM_ARG_OR_ZERO(THUMB_CODE), relocType);
+                    image->FixupFieldToNode(slotBase, slotOffset, importThunk ARM_ARG(THUMB_CODE) NOT_ARM_ARG(0), relocType);
                 }
                 else
                 {