Clean up #else in EECodeManager::GetAmbientSP (dotnet/coreclr#9049)

Commit migrated from https://github.com/dotnet/coreclr/commit/0a0696ed88fe3b3240557bf9a432b723ccb1ff7e

diff --git a/src/coreclr/src/inc/eetwain.h b/src/coreclr/src/inc/eetwain.h
index 1d195d7..b04379b 100644 (file)
--- a/src/coreclr/src/inc/eetwain.h
+++ b/src/coreclr/src/inc/eetwain.h
@@ -174,6 +174,7 @@ virtual void FixContext(ContextType     ctxType,
 
 #endif // #ifndef DACCESS_COMPILE
 
+#ifdef _TARGET_X86_
 /*
     Gets the ambient stack pointer value at the given nesting level within
     the method.
@@ -183,6 +184,7 @@ virtual TADDR GetAmbientSP(PREGDISPLAY     pContext,
                            DWORD           dwRelOffset,
                            DWORD           nestingLevel,
                            CodeManState   *pState) = 0;
+#endif // _TARGET_X86_
 
 /*
     Get the number of bytes used for stack parameters.
@@ -386,6 +388,7 @@ void FixContext(ContextType     ctxType,
 
 #endif // #ifndef DACCESS_COMPILE
 
+#ifdef _TARGET_X86_
 /*
     Gets the ambient stack pointer value at the given nesting level within
     the method.
@@ -396,6 +399,7 @@ TADDR GetAmbientSP(PREGDISPLAY     pContext,
                    DWORD           dwRelOffset,
                    DWORD           nestingLevel,
                    CodeManState   *pState);
+#endif // _TARGET_X86_
 
 /*
     Get the number of bytes used for stack parameters.

diff --git a/src/coreclr/src/vm/eetwain.cpp b/src/coreclr/src/vm/eetwain.cpp
index 538d6a2..414f8f3 100644 (file)
--- a/src/coreclr/src/vm/eetwain.cpp
+++ b/src/coreclr/src/vm/eetwain.cpp
@@ -5812,6 +5812,7 @@ void EECodeManager::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
 #endif // #ifdef DACCESS_COMPILE
 
 
+#ifdef _TARGET_X86_
 /*
  *  GetAmbientSP
  *
@@ -5834,7 +5835,6 @@ TADDR EECodeManager::GetAmbientSP(PREGDISPLAY     pContext,
         SUPPORTS_DAC;
     } CONTRACTL_END;
 
-#ifdef _TARGET_X86_
     GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken();
 
     _ASSERTE(sizeof(CodeManStateBuf) <= sizeof(pState->stateBuf));
@@ -5907,12 +5907,8 @@ TADDR EECodeManager::GetAmbientSP(PREGDISPLAY     pContext,
     }
 
     return baseSP;
-
-#else // !_TARGET_X86_
-    PORTABILITY_ASSERT("EECodeManager::GetAmbientSP is not implemented on this platform.");
-    return 0;
-#endif // _TARGET_X86_
 }
+#endif // _TARGET_X86_
 
 /*
     Get the number of bytes used for stack parameters.