Skip to content

Fix Linux x86 build #34548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 3 commits into from
Apr 6, 2020
Merged

Fix Linux x86 build #34548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15fdfac
Fix Linux x86 build
gbalykov Apr 4, 2020
8e8efcb
Fix Linux x86 build
gbalykov Apr 4, 2020
38271a5
Fix Linux x86 build
gbalykov Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/comdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ void COMDelegate::BindToMethod(DELEGATEREF *pRefThis,
GCPROTECT_END();
}

#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
#if defined(TARGET_X86)
// Marshals a managed method to an unmanaged callback provided the
// managed method is static and it's parameters require no marshalling.
PCODE COMDelegate::ConvertToCallback(MethodDesc* pMD)
Expand Down Expand Up @@ -1189,7 +1189,7 @@ PCODE COMDelegate::ConvertToCallback(MethodDesc* pMD)
_ASSERTE(pCode != NULL);
return pCode;
}
#endif // defined(TARGET_X86) && defined(TARGET_WINDOWS)
#endif // defined(TARGET_X86)

// Marshals a delegate to a unmanaged callback.
LPVOID COMDelegate::ConvertToCallback(OBJECTREF pDelegateObj)
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/src/vm/comdelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ class COMDelegate
// Marshals a delegate to a unmanaged callback.
static LPVOID ConvertToCallback(OBJECTREF pDelegate);

#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
#if defined(TARGET_X86)
// Marshals a managed method to an unmanaged callback.
// This is only used on x86 Windows. See usage for further details.
// This is only used on x86. See usage for further details.
static PCODE ConvertToCallback(MethodDesc* pMD);
#endif // defined(TARGET_X86) && defined(TARGET_WINDOWS)
#endif // defined(TARGET_X86)

// Marshals an unmanaged callback to Delegate
static OBJECTREF ConvertToDelegate(LPVOID pCallback, MethodTable* pMT);
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/src/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,7 @@ lExit: ;

if ((ExceptionContinueSearch == returnDisposition))
{
#ifdef USE_GC_INFO_DECODER
if (dwExceptionFlags & EXCEPTION_UNWINDING)
{
EECodeInfo codeInfo(pDispatcherContext->ControlPc);
Expand All @@ -1279,6 +1280,7 @@ lExit: ;
}
}
}
#endif // USE_GC_INFO_DECODER

GCX_PREEMP_NO_DTOR();
}
Expand Down Expand Up @@ -4681,6 +4683,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
controlPc = Thread::VirtualUnwindLeafCallFrame(frameContext);
}

#ifdef USE_GC_INFO_DECODER
GcInfoDecoder gcInfoDecoder(codeInfo.GetGCInfoToken(), DECODE_REVERSE_PINVOKE_VAR);

if (gcInfoDecoder.GetReversePInvokeFrameStackSlot() != NO_REVERSE_PINVOKE_FRAME)
Expand All @@ -4694,6 +4697,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
TerminateProcess(GetCurrentProcess(), 1);
UNREACHABLE();
}
#endif // USE_GC_INFO_DECODER

// Check whether we are crossing managed-to-native boundary
while (!ExecutionManager::IsManagedCode(controlPc))
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/vm/i386/asmhelpers.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ NESTED_ENTRY OnCallCountThresholdReachedStub2, _TEXT, NoHandler

// Align the stack for the call
lea ebx, [esp - 8]
and ebx, 0fh
and ebx, 0x0f
sub esp, ebx

push eax // stub-identifying token, see OnCallCountThresholdReachedStub
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/prestub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ PCODE MethodDesc::GetPrecompiledCode(PrepareCodeConfig* pConfig)

#ifdef FEATURE_TIERED_COMPILATION
bool shouldTier = pConfig->GetMethodDesc()->IsEligibleForTieredCompilation();
#if !defined(TARGET_X86) || !defined(TARGET_WINDOWS)
#if !defined(TARGET_X86)
CallerGCMode callerGcMode = pConfig->GetCallerGCMode();
// If the method is eligible for tiering but is being
// called from a Preemptive GC Mode thread or the method
Expand All @@ -458,7 +458,7 @@ PCODE MethodDesc::GetPrecompiledCode(PrepareCodeConfig* pConfig)
codeVersion.SetOptimizationTier(NativeCodeVersion::OptimizationTierOptimized);
shouldTier = false;
}
#endif // !TARGET_X86 || !TARGET_WINDOWS
#endif // !TARGET_X86
#endif // FEATURE_TIERED_COMPILATION

if (pConfig->SetNativeCode(pCode, &pCode))
Expand Down