[x86/Linux] Clean up ZapUnwindData (dotnet/coreclr#10750)

Commit migrated from https://github.com/dotnet/coreclr/commit/4abb8b63b2e51550ae3e0a8b04129deaf99bdf7e

diff --git a/src/coreclr/src/vm/codeman.cpp b/src/coreclr/src/vm/codeman.cpp
index c2632f7..73b4c06 100644 (file)
--- a/src/coreclr/src/vm/codeman.cpp
+++ b/src/coreclr/src/vm/codeman.cpp
@@ -985,10 +985,10 @@ PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFuncti
 
     return pUnwindInfo;
 
-#elif defined(_TARGET_X86_) && defined(FEATURE_PAL)
+#elif defined(_TARGET_X86_)
     PTR_UNWIND_INFO pUnwindInfo(dac_cast<PTR_UNWIND_INFO>(moduleBase + RUNTIME_FUNCTION__GetUnwindInfoAddress(pRuntimeFunction)));
 
-    *pSize = ALIGN_UP(sizeof(UNWIND_INFO), sizeof(DWORD));
+    *pSize = sizeof(UNWIND_INFO);
 
     return pUnwindInfo;
 

diff --git a/src/coreclr/src/zap/zapcode.cpp b/src/coreclr/src/zap/zapcode.cpp
index ead385d..7384283 100644 (file)
--- a/src/coreclr/src/zap/zapcode.cpp
+++ b/src/coreclr/src/zap/zapcode.cpp
@@ -1202,7 +1202,7 @@ void ZapUnwindData::Save(ZapWriter * pZapWriter)
 #endif //REDHAWK
 }
 
-#elif defined(_TARGET_X86_) && defined(FEATURE_PAL)
+#elif defined(_TARGET_X86_)
 
 UINT ZapUnwindData::GetAlignment()
 {
@@ -1211,9 +1211,7 @@ UINT ZapUnwindData::GetAlignment()
 
 DWORD ZapUnwindData::GetSize()
 {
-    DWORD dwSize = ZapBlob::GetSize();
-
-    return dwSize;
+    return ZapBlob::GetSize();
 }
 
 void ZapUnwindData::Save(ZapWriter * pZapWriter)