diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-04-06 18:51:19 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-04-06 11:51:19 +0200 |
| commit | 4abb8b63b2e51550ae3e0a8b04129deaf99bdf7e (patch) | |
| tree | fa2e9dc35ff359a9efed6947896817619ebaf2b0 | |
| parent | f9d0333d8955c11a2e8f495f0a12d6384fb95541 (diff) | |
| download | coreclr-4abb8b63b2e51550ae3e0a8b04129deaf99bdf7e.tar.gz coreclr-4abb8b63b2e51550ae3e0a8b04129deaf99bdf7e.tar.bz2 coreclr-4abb8b63b2e51550ae3e0a8b04129deaf99bdf7e.zip | |
[x86/Linux] Clean up ZapUnwindData (#10750)
| -rw-r--r-- | src/vm/codeman.cpp | 4 | ||||
| -rw-r--r-- | src/zap/zapcode.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp index c2632f7f8a..73b4c06565 100644 --- a/src/vm/codeman.cpp +++ b/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/zap/zapcode.cpp b/src/zap/zapcode.cpp index ead385d5e0..738428354d 100644 --- a/src/zap/zapcode.cpp +++ b/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) |