Create the native-to-interpreter call stub in a better place so it's always present when we need it

Revert changes to the helper

Author: kg

src/coreclr/vm/amd64/AsmHelpers.asm

@@ -5,7 +5,6 @@ include AsmMacros.inc
 include asmconstants.inc
 
 Thread_GetInterpThreadContext  TEXTEQU <?GetInterpThreadContext@Thread@@QEAAPEAUInterpThreadContext@@XZ>
-CreateNativeToInterpreterCallStub  TEXTEQU <?CreateNativeToInterpreterCallStub@@YAPEAUCallStubHeader@@PEAUInterpMethod@@@Z>
 
 extern PInvokeImportWorker:proc
 extern ThePreStub:proc
@@ -17,7 +16,6 @@ extern JIT_RareDisableHelperWorker:proc
 ifdef FEATURE_INTERPRETER
 extern ExecuteInterpretedMethod:proc
 extern Thread_GetInterpThreadContext:proc
-extern CreateNativeToInterpreterCallStub:proc
 endif
 
 extern g_pPollGC:QWORD
@@ -580,34 +578,8 @@ HaveInterpThreadContext:
         mov             r10, qword ptr [rax + OFFSETOF__InterpThreadContext__pStackPointer]
         ; Load the InterpMethod pointer from the IR bytecode
         mov             rax, qword ptr [rbx]
-
-        ; Do we have a call stub? If not, create it.
-        mov             r11, qword ptr [rax + OFFSETOF__InterpMethod__pCallStub]
-        test            r11, r11
-        jnz             HaveCallStub
-
-        ; Pass the InterpMethod * to CreateNativeToInterpreterCallStub so it can populate the call stub
-        mov             rcx, rax
-        ; The x64 ABI considers the registers RAX, RCX, RDX, R8, R9, R10, R11, and XMM0-XMM5 volatile.
-        push            rax
-        push            rdx
-        push            r8
-        push            r9
-        push            r10
-        ; We're going to recreate r11 after this and we already trashed rcx so we don't need to save it.
-        call            CreateNativeToInterpreterCallStub
-        ; Restore the volatile registers
-        pop             r10
-        pop             r9
-        pop             r9
-        pop             rdx
-        pop             rax
-        ; CreateNativeToInterpreterCallStub populated pCallStub so now load it
-        mov             r11, qword ptr [rax + OFFSETOF__InterpMethod__pCallStub]
-
-HaveCallStub:
-
-        lea             r11, qword ptr [r11 + OFFSETOF__CallStubHeader__Routines]
+        mov             rax, qword ptr [rax + OFFSETOF__InterpMethod__pCallStub]
+        lea             r11, qword ptr [rax + OFFSETOF__CallStubHeader__Routines]
         lea             rax, [rsp + __PWTB_TransitionBlock]
         ; Copy the arguments to the interpreter stack, invoke the InterpExecMethod and load the return value
         call            qword ptr [r11]

src/coreclr/vm/prestub.cpp

@@ -1004,6 +1004,11 @@ PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_
         InterpreterPrecode* pPrecode = InterpreterPrecode::FromEntryPoint(pCode);
         InterpByteCodeStart* interpreterCode = dac_cast<InterpByteCodeStart*>(pPrecode->GetData()->ByteCodeAddr);
         pConfig->GetMethodDesc()->SetInterpreterCode(interpreterCode);
+
+        // Ensure the method has a call stub. We have to do this eagerly here.
+#if defined(FEATURE_JIT)
+        CreateNativeToInterpreterCallStub(interpreterCode->Method);
+#endif
     }
 #endif // FEATURE_INTERPRETER
 
@@ -2377,14 +2382,6 @@ PCODE MethodDesc::DoPrestub(MethodTable *pDispatchingMT, CallerGCMode callerGCMo
     pCode = DoBackpatch(pMT, pDispatchingMT, FALSE);
 
 Return:
-#if defined(FEATURE_INTERPRETER) && defined(FEATURE_JIT)
-    InterpByteCodeStart *pInterpreterCode = GetInterpreterCode();
-    if (pInterpreterCode != NULL)
-    {
-        CreateNativeToInterpreterCallStub(pInterpreterCode->Method);
-    }
-#endif // FEATURE_INTERPRETER && FEATURE_JIT
-
     RETURN pCode;
 }
 
@@ -2944,7 +2941,7 @@ static PCODE getHelperForSharedStatic(Module * pModule, ReadyToRunFixupKind kind
     }
     pArgs->offset = pFD->GetOffset();
 
-    BinderMethodID managedHelperId = fUnbox ? 
+    BinderMethodID managedHelperId = fUnbox ?
         METHOD__STATICSHELPERS__STATICFIELDADDRESSUNBOX_DYNAMIC :
         METHOD__STATICSHELPERS__STATICFIELDADDRESS_DYNAMIC;