Revert unnecessary changes

Author: jakobbotsch

src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp

@@ -4584,7 +4584,7 @@ void MethodContext::recGetOSRInfo(PatchpointInfo* patchpointInfo, unsigned* ilOf
 
     value.index = (DWORD)GetOSRInfo->AddBuffer((const unsigned char*) patchpointInfo, patchpointInfo->PatchpointInfoSize());
     value.ilOffset = *ilOffset;
-    
+
     // use 0 for key
     DWORD key = 0;
     GetOSRInfo->Add(key, value);

src/coreclr/vm/codeman.cpp

@@ -1033,7 +1033,7 @@ void IJitManager::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
 
 #endif // #ifdef DACCESS_COMPILE
 
-PTR_VOID EECodeInfo::GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFunction, /* out */ SIZE_T * pSize)
+PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFunction, /* out */ SIZE_T * pSize)
 {
     LIMITED_METHOD_CONTRACT;
 
@@ -6463,7 +6463,7 @@ GCInfoToken ReadyToRunJitManager::GetGCInfoToken(const METHODTOKEN& MethodToken)
     TADDR baseAddress = JitTokenToModuleBase(MethodToken);
 
     SIZE_T nUnwindDataSize;
-    PTR_VOID pUnwindData = EECodeInfo::GetUnwindDataBlob(baseAddress, pRuntimeFunction, &nUnwindDataSize);
+    PTR_VOID pUnwindData = GetUnwindDataBlob(baseAddress, pRuntimeFunction, &nUnwindDataSize);
 
     // GCInfo immediately follows unwind data
     PTR_BYTE gcInfo = dac_cast<PTR_BYTE>(pUnwindData) + nUnwindDataSize;
@@ -6951,7 +6951,7 @@ BOOL ReadyToRunJitManager::LazyIsFunclet(EECodeInfo* pCodeInfo)
     {
         // This maps to a hot entry in the lookup table, so check its unwind info
         SIZE_T unwindSize;
-        PTR_VOID pUnwindData = EECodeInfo::GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pCodeInfo->GetFunctionEntry(), &unwindSize);
+        PTR_VOID pUnwindData = GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pCodeInfo->GetFunctionEntry(), &unwindSize);
         _ASSERTE(pUnwindData != NULL);
 
 #ifdef TARGET_AMD64
@@ -6991,7 +6991,7 @@ BOOL ReadyToRunJitManager::IsFilterFunclet(EECodeInfo * pCodeInfo)
 #else
     // Get address of the personality routine for the function being queried.
     SIZE_T size;
-    PTR_VOID pUnwindData = EECodeInfo::GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pCodeInfo->GetFunctionEntry(), &size);
+    PTR_VOID pUnwindData = GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pCodeInfo->GetFunctionEntry(), &size);
     _ASSERTE(pUnwindData != NULL);
 
     // Personality routine is always the last element of the unwind data
@@ -7002,7 +7002,7 @@ BOOL ReadyToRunJitManager::IsFilterFunclet(EECodeInfo * pCodeInfo)
     if (pInfo->m_nRuntimeFunctions == 0)
         return FALSE;
 
-    PTR_VOID pFirstUnwindData = EECodeInfo::GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pInfo->m_pRuntimeFunctions, &size);
+    PTR_VOID pFirstUnwindData = GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pInfo->m_pRuntimeFunctions, &size);
     _ASSERTE(pFirstUnwindData != NULL);
     DWORD rvaFirstPersonalityRoutine = *(dac_cast<PTR_DWORD>(dac_cast<TADDR>(pFirstUnwindData) + size) - 1);
 
@@ -7109,7 +7109,7 @@ void ReadyToRunJitManager::EnumMemoryRegionsForMethodUnwindInfo(CLRDataEnumMemor
     EnumRuntimeFunctionEntriesToFindEntry(pRtf, pReadyToRunInfo->m_pRuntimeFunctions, pReadyToRunInfo->m_nRuntimeFunctions);
 
     SIZE_T size;
-    PTR_VOID pUnwindData = EECodeInfo::GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pRtf, &size);
+    PTR_VOID pUnwindData = GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pRtf, &size);
     if (pUnwindData != NULL)
         DacEnumMemoryRegion(PTR_TO_TADDR(pUnwindData), size);
 }

src/coreclr/vm/codeman.h

@@ -3105,10 +3105,8 @@ ULONG       GetFixedStackSize();
     ULONG       GetFixedStackSize();
 
     void         GetOffsetsFromUnwindInfo(ULONG* pRSPOffset, ULONG* pRBPOffset);
-    unsigned     GetSizeOfProlog();
 #endif // TARGET_AMD64
 
-    static PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFunction, /* out */ SIZE_T * pSize);
 private:
     PCODE               m_codeAddress;
     METHODTOKEN         m_methodToken;
@@ -3127,6 +3125,7 @@ ULONG       GetFixedStackSize();
     // Simple helper to return a pointer to the UNWIND_INFO given the offset to the unwind info.
     UNWIND_INFO * GetUnwindInfoHelper(ULONG unwindInfoOffset);
 #endif // TARGET_AMD64
+
 };
 
 #ifdef FEATURE_INTERPRETER

src/coreclr/vm/jitinterface.cpp

@@ -15687,22 +15687,5 @@ void EECodeInfo::GetOffsetsFromUnwindInfo(ULONG* pRSPOffset, ULONG* pRBPOffset)
     *pRSPOffset = StackSize + 8;        // add 8 for the return address
     *pRBPOffset = StackOffset;
 }
-
-unsigned EECodeInfo::GetSizeOfProlog()
-{
-    LIMITED_METHOD_CONTRACT;
-    TADDR moduleBase = GetModuleBase();
-
-    DWORD unwindInfo = RUNTIME_FUNCTION__GetUnwindInfoAddress(GetFunctionEntry());
-
-    if ((unwindInfo & RUNTIME_FUNCTION_INDIRECT) != 0)
-    {
-        unwindInfo = RUNTIME_FUNCTION__GetUnwindInfoAddress(PTR_RUNTIME_FUNCTION(moduleBase + (unwindInfo & ~RUNTIME_FUNCTION_INDIRECT)));
-    }
-
-    UNWIND_INFO * pInfo = GetUnwindInfoHelper(unwindInfo);
-    _ASSERTE((pInfo->Flags & UNW_FLAG_CHAININFO) == 0);
-    return pInfo->SizeOfProlog;
-}
 #undef kRBP
 #endif // defined(TARGET_AMD64)