Delete redundant RhpUniversalTransition (#122689)

Left-over from .NET Native calling convention converter. We only need
the tailcall variant of universal transition.

Author: jkotas

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -272,8 +272,6 @@ if(CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_WASM)
   add_definitions(-DFEATURE_64BIT_ALIGNMENT)
 endif()
 
-add_definitions(-DFEATURE_CUSTOM_IMPORTS)
-add_definitions(-DFEATURE_DYNAMIC_CODE)
 add_compile_definitions($<$<CONFIG:Debug,Checked>:FEATURE_GC_STRESS>)
 add_definitions(-DFEATURE_NATIVEAOT)
 add_definitions(-DVERIFY_HEAP)

src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp

@@ -32,11 +32,7 @@
 #pragma warning(disable:4061)
 
 #if !defined(FEATURE_PORTABLE_HELPERS) // @TODO: these are (currently) only implemented in assembly helpers
-
-#if defined(FEATURE_DYNAMIC_CODE)
-EXTERN_C CODE_LOCATION ReturnFromUniversalTransition;
-EXTERN_C CODE_LOCATION ReturnFromUniversalTransition_DebugStepTailCall;
-#endif
+EXTERN_C CODE_LOCATION ReturnFromUniversalTransitionTailCall;
 
 EXTERN_C CODE_LOCATION RhpCallCatchFunclet2;
 EXTERN_C CODE_LOCATION RhpCallFinallyFunclet2;
@@ -2231,13 +2227,10 @@ StackFrameIterator::ReturnAddressCategory StackFrameIterator::CategorizeUnadjust
 
 #else // defined(FEATURE_PORTABLE_HELPERS)
 
-#if defined(FEATURE_DYNAMIC_CODE)
-    if (EQUALS_RETURN_ADDRESS(returnAddress, ReturnFromUniversalTransition) ||
-             EQUALS_RETURN_ADDRESS(returnAddress, ReturnFromUniversalTransition_DebugStepTailCall))
+    if (EQUALS_RETURN_ADDRESS(returnAddress, ReturnFromUniversalTransitionTailCall))
     {
         return InUniversalTransitionThunk;
     }
-#endif
 
     if (EQUALS_RETURN_ADDRESS(returnAddress, RhpThrowEx2) ||
         EQUALS_RETURN_ADDRESS(returnAddress, RhpThrowHwEx2) ||

src/coreclr/nativeaot/Runtime/amd64/CachedInterfaceDispatchAot.S

@@ -14,6 +14,6 @@ LEAF_ENTRY RhpInterfaceDispatchSlow, _TEXT
         // r11 contains indirection cell address already, so it will naturally be passed to RhpCidResolve
         // the universal transition thunk as an argument to RhpCidResolve
         mov r10, [rip + REL_C_FUNC(RhpCidResolve)]
-        jmp qword ptr [rip + REL_C_FUNC(RhpUniversalTransition_DebugStepTailCall)]
+        jmp qword ptr [rip + REL_C_FUNC(RhpUniversalTransitionTailCall)]
 
 LEAF_END RhpInterfaceDispatchSlow, _TEXT

src/coreclr/nativeaot/Runtime/amd64/CachedInterfaceDispatchAot.asm

@@ -4,17 +4,14 @@
 include AsmMacros.inc
 
 EXTERN RhpCidResolve : PROC
-EXTERN RhpUniversalTransition_DebugStepTailCall : PROC
-
-EXTERN RhpCidResolve : PROC
-EXTERN RhpUniversalTransition_DebugStepTailCall : PROC
+EXTERN RhpUniversalTransitionTailCall : PROC
 
 ;; Cache miss case, call the runtime to resolve the target and update the cache.
 ;; Use universal transition helper to allow an exception to flow out of resolution
 LEAF_ENTRY RhpInterfaceDispatchSlow, _TEXT
         ;; r11 contains indirection cell address
         lea r10, RhpCidResolve
-        jmp RhpUniversalTransition_DebugStepTailCall
+        jmp RhpUniversalTransitionTailCall
 
 LEAF_END RhpInterfaceDispatchSlow, _TEXT
 

src/coreclr/nativeaot/Runtime/amd64/UniversalTransition.S

@@ -4,8 +4,6 @@
 .intel_syntax noprefix
 #include <unixasmmacros.inc>
 
-#ifdef FEATURE_DYNAMIC_CODE
-
 #ifdef _DEBUG
 #define TRASH_SAVED_ARGUMENT_REGISTERS 1
 #endif
@@ -153,10 +151,4 @@ NESTED_END Rhp\FunctionName, _TEXT
 
 .endm // UNIVERSAL_TRANSITION
 
-        // To enable proper step-in behavior in the debugger, we need to have two instances
-        // of the thunk. For the first one, the debugger steps into the call in the function,
-        // for the other, it steps over it.
-        UNIVERSAL_TRANSITION UniversalTransition
-        UNIVERSAL_TRANSITION UniversalTransition_DebugStepTailCall
-
-#endif // FEATURE_DYNAMIC_CODE
+        UNIVERSAL_TRANSITION UniversalTransitionTailCall

src/coreclr/nativeaot/Runtime/amd64/UniversalTransition.asm

@@ -3,8 +3,6 @@
 
 include AsmMacros.inc
 
-ifdef FEATURE_DYNAMIC_CODE
-
 ifdef _DEBUG
 TRASH_SAVED_ARGUMENT_REGISTERS equ 1
 else
@@ -152,12 +150,6 @@ NESTED_END Rhp&FunctionName, _TEXT
 
         endm
 
-        ; To enable proper step-in behavior in the debugger, we need to have two instances
-        ; of the thunk. For the first one, the debugger steps into the call in the function,
-        ; for the other, it steps over it.
-        UNIVERSAL_TRANSITION UniversalTransition
-        UNIVERSAL_TRANSITION UniversalTransition_DebugStepTailCall
-
-endif
+        UNIVERSAL_TRANSITION UniversalTransitionTailCall
 
 end

src/coreclr/nativeaot/Runtime/arm/UniversalTransition.S

@@ -7,8 +7,6 @@
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
 #include <unixasmmacros.inc>
 
-#ifdef FEATURE_DYNAMIC_CODE
-
 #ifdef _DEBUG
 #define TRASH_SAVED_ARGUMENT_REGISTERS
 #endif
@@ -144,10 +142,4 @@ NESTED_END Rhp\FunctionName, _TEXT
 
 .endm
 
-// To enable proper step-in behavior in the debugger, we need to have two instances
-// of the thunk. For the first one, the debugger steps into the call in the function,
-// for the other, it steps over it.
-UNIVERSAL_TRANSITION UniversalTransition
-UNIVERSAL_TRANSITION UniversalTransition_DebugStepTailCall
-
-#endif // FEATURE_DYNAMIC_CODE
+UNIVERSAL_TRANSITION UniversalTransitionTailCall

src/coreclr/nativeaot/Runtime/arm64/CachedInterfaceDispatchAot.S

@@ -7,7 +7,7 @@
 #ifdef FEATURE_CACHED_INTERFACE_DISPATCH
 
     .extern RhpCidResolve
-    .extern RhpUniversalTransition_DebugStepTailCall
+    .extern RhpUniversalTransitionTailCall
 
 //
 // Cache miss case, call the runtime to resolve the target and update the cache.
@@ -20,7 +20,7 @@
         //  xip1: parameter of the thunk's target
         PREPARE_EXTERNAL_VAR RhpCidResolve, xip0
         mov xip1, x11
-        b       C_FUNC(RhpUniversalTransition_DebugStepTailCall)
+        b       C_FUNC(RhpUniversalTransitionTailCall)
     LEAF_END RhpInterfaceDispatchSlow, _TEXT
 
 #endif // FEATURE_CACHED_INTERFACE_DISPATCH

src/coreclr/nativeaot/Runtime/arm64/CachedInterfaceDispatchAot.asm

@@ -8,7 +8,7 @@
 #ifdef FEATURE_CACHED_INTERFACE_DISPATCH
 
     EXTERN RhpCidResolve
-    EXTERN RhpUniversalTransition_DebugStepTailCall
+    EXTERN RhpUniversalTransitionTailCall
 
 ;;
 ;; Cache miss case, call the runtime to resolve the target and update the cache.
@@ -21,7 +21,7 @@
         ;;  xip1: parameter of the thunk's target
         ldr     xip0, =RhpCidResolve
         mov     xip1, x11
-        b       RhpUniversalTransition_DebugStepTailCall
+        b       RhpUniversalTransitionTailCall
     LEAF_END RhpInterfaceDispatchSlow
 
 #endif // FEATURE_CACHED_INTERFACE_DISPATCH

src/coreclr/nativeaot/Runtime/arm64/UniversalTransition.S

@@ -158,9 +158,5 @@ ALTERNATE_ENTRY ReturnFrom\FunctionName
 
     .endm
 
-    // To enable proper step-in behavior in the debugger, we need to have two instances
-    // of the thunk. For the first one, the debugger steps into the call in the function,
-    // for the other, it steps over it.
-    UNIVERSAL_TRANSITION UniversalTransition
-    UNIVERSAL_TRANSITION UniversalTransition_DebugStepTailCall
+    UNIVERSAL_TRANSITION UniversalTransitionTailCall