More fixes

Author: MichalStrehovsky

src/coreclr/nativeaot/Runtime/EHHelpers.cpp

@@ -276,18 +276,14 @@ static bool InWriteBarrierHelper(uintptr_t faultingIP)
     return false;
 }
 
-#if (defined(HOST_AMD64) || defined(HOST_ARM64)) && defined(HOST_WINDOWS)
 EXTERN_C CODE_LOCATION RhpResolveInterfaceMethodFast;
-#endif
 
 static bool InInterfaceDispatchHelper(uintptr_t faultingIP)
 {
 #ifndef FEATURE_PORTABLE_HELPERS
     static uintptr_t interfaceDispatchAVLocations[] =
     {
-#if (defined(HOST_AMD64) || defined(HOST_ARM64)) && defined(HOST_WINDOWS)
         (uintptr_t)&RhpResolveInterfaceMethodFast,
-#endif
     };
 
     // compare the IP against the list of known possible AV locations in the interface dispatch helpers

src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp

@@ -33,9 +33,6 @@
 
 #if !defined(FEATURE_PORTABLE_HELPERS) // @TODO: these are (currently) only implemented in assembly helpers
 EXTERN_C CODE_LOCATION ReturnFromUniversalTransitionTailCall;
-#if (defined(HOST_AMD64) || defined(HOST_ARM64)) && defined(HOST_WINDOWS)
-EXTERN_C CODE_LOCATION ReturnFromUniversalTransitionReturnResult;
-#endif
 
 EXTERN_C CODE_LOCATION RhpCallCatchFunclet2;
 EXTERN_C CODE_LOCATION RhpCallFinallyFunclet2;
@@ -2234,12 +2231,6 @@ StackFrameIterator::ReturnAddressCategory StackFrameIterator::CategorizeUnadjust
     {
         return InUniversalTransitionThunk;
     }
-#if (defined(HOST_AMD64) || defined(HOST_ARM64)) && defined(HOST_WINDOWS)
-    if (EQUALS_RETURN_ADDRESS(returnAddress, ReturnFromUniversalTransitionReturnResult))
-    {
-        return InUniversalTransitionThunk;
-    }
-#endif
 
     if (EQUALS_RETURN_ADDRESS(returnAddress, RhpThrowImpl2) ||
         EQUALS_RETURN_ADDRESS(returnAddress, RhpThrowHwEx2) ||

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

@@ -82,7 +82,7 @@ DISTANCE_FROM_CHILDSP_TO_CALLERSP               equ DISTANCE_FROM_CHILDSP_TO_RET
 ; everything between the base of the ReturnBlock and the top of the StackPassedArgs.
 ;
 
-UNIVERSAL_TRANSITION macro FunctionName, ExitSequence
+UNIVERSAL_TRANSITION macro FunctionName
 
 NESTED_ENTRY Rhp&FunctionName, _TEXT
 
@@ -144,13 +144,12 @@ ALTERNATE_ENTRY ReturnFrom&FunctionName
         ; Pop the space that was allocated between the ChildSP and the caller return address.
         add             rsp, DISTANCE_FROM_CHILDSP_TO_RETADDR
 
-        ExitSequence
+        TAILJMP_RAX
 
 NESTED_END Rhp&FunctionName, _TEXT
 
         endm
 
-        UNIVERSAL_TRANSITION UniversalTransitionTailCall, TAILJMP_RAX
-        UNIVERSAL_TRANSITION UniversalTransitionReturnResult, ret
+        UNIVERSAL_TRANSITION UniversalTransitionTailCall
 
 end

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

@@ -6,9 +6,9 @@
     TEXTAREA
 
     EXTERN RhpCidResolve
-    EXTERN RhpUniversalTransitionReturnResult
+    EXTERN RhpUniversalTransitionTailCall
 
-    NESTED_ENTRY RhpResolveInterfaceMethodFast, _TEXT
+    LEAF_ENTRY RhpResolveInterfaceMethodFast, _TEXT
 
         ;; Load the MethodTable from the object instance in x0.
         ;; Trigger an AV if we're dispatching on a null this.
@@ -17,40 +17,11 @@
         ;; to a NullReferenceException at the callsite.
         ldr     x12, [x0]
 
-        ;; x11 currently contains the indirection cell address.
-        ;; load x13 to point to the cache block.
-        ldr     x13, [x11, #OFFSETOF__InterfaceDispatchCell__m_pCache]
-        and     x14, x13, #IDC_CACHE_POINTER_MASK
-        cbnz    x14, RhpResolveInterfaceMethodFast_SlowPath
-
-        add     x14, x13, #OFFSETOF__InterfaceDispatchCache__m_rgEntries
-        ldr     x15, [x14]
-        cmp     x15, x12
-        bne     RhpResolveInterfaceMethodFast_Polymorphic
-        ldur    x15, [x14, #8]
-        ret
-
-RhpResolveInterfaceMethodFast_Polymorphic
-        ldr     w13, [x13, #OFFSETOF__InterfaceDispatchCache__m_cEntries]
-
-RhpResolveInterfaceMethodFast_NextEntry
-        add     x14, x14, #SIZEOF__InterfaceDispatchCacheEntry
-        sub     w13, w13, #1
-        cmp     w13, #0
-        beq     RhpResolveInterfaceMethodFast_SlowPath
-
-        ldr     x15, [x14]
-        cmp     x15, x12
-        bne     RhpResolveInterfaceMethodFast_NextEntry
-
-        ldur    x15, [x14, #8]
-        ret
-
 RhpResolveInterfaceMethodFast_SlowPath
         ldr     xip0, =RhpCidResolve
         mov     xip1, x11
-        b       RhpUniversalTransitionReturnResult
+        b       RhpUniversalTransitionTailCall
 
-    NESTED_END RhpResolveInterfaceMethodFast
+    LEAF_END RhpResolveInterfaceMethodFast
 
     END

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

@@ -89,7 +89,7 @@
     TEXTAREA
 
     MACRO
-        UNIVERSAL_TRANSITION $FunctionName, $ReturnResult
+        UNIVERSAL_TRANSITION $FunctionName
 
     NESTED_ENTRY Rhp$FunctionName
 
@@ -142,20 +142,13 @@
         ;; Restore FP and LR registers, and free the allocated stack block
         EPILOG_RESTORE_REG_PAIR   fp, lr, #STACK_SIZE!
 
-        IF $ReturnResult == 0
         ;; Tailcall to the target address.
         EPILOG_NOP br x12
-        ELSE
-        ;; Return target address
-        EPILOG_NOP mov x15, x12
-        ret
-        ENDIF
 
     NESTED_END Rhp$FunctionName
 
     MEND
 
-    UNIVERSAL_TRANSITION UniversalTransitionTailCall, 0
-    UNIVERSAL_TRANSITION UniversalTransitionReturnResult, 1
+    UNIVERSAL_TRANSITION UniversalTransitionTailCall
 
     END