Skip to content

Remove FEATURE_READYTORUN_COMPILER define from non-JIT code. #57672

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
3 commits merged into from
Aug 18, 2021
Merged

Remove FEATURE_READYTORUN_COMPILER define from non-JIT code. #57672

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
66fbd4c
Remove FEATURE_READYTORUN_COMPILER define from non-JIT code.
jkoritzinsky Aug 18, 2021
f93e3d8
Remove IsReadyToRunCompilation() and all branches that required it to…
jkoritzinsky Aug 18, 2021
688eb22
Merge branch 'main' of github.com:dotnet/runtime into remove-r2rcompi…
jkoritzinsky Aug 18, 2021
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
22 changes: 0 additions & 22 deletions src/coreclr/inc/corcompile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,26 +1164,4 @@ extern "C" unsigned __stdcall PartialNGenStressPercentage();
extern "C" HRESULT __stdcall CreatePdb(CORINFO_ASSEMBLY_HANDLE hAssembly, BSTR pNativeImagePath, BSTR pPdbPath, BOOL pdbLines, BSTR pManagedPdbSearchPath, LPCWSTR pDiasymreaderPath);

extern bool g_fNGenMissingDependenciesOk;

#ifdef FEATURE_READYTORUN_COMPILER
extern bool g_fReadyToRunCompilation;
extern bool g_fLargeVersionBubble;
#endif

inline bool IsReadyToRunCompilation()
{
#ifdef FEATURE_READYTORUN_COMPILER
return g_fReadyToRunCompilation;
#else
return false;
#endif
}

#ifdef FEATURE_READYTORUN_COMPILER
inline bool IsLargeVersionBubbleEnabled()
{
return g_fLargeVersionBubble;
}
#endif

#endif /* COR_COMPILE_H_ */
4 changes: 2 additions & 2 deletions src/coreclr/vm/ceeload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3089,7 +3089,7 @@ BOOL Module::IsInCurrentVersionBubble()
return TRUE;
}

#if defined(FEATURE_READYTORUN) && !defined(FEATURE_READYTORUN_COMPILER)
#if defined(FEATURE_READYTORUN)
//---------------------------------------------------------------------------------------
// Check if the target module is in the same version bubble as this one
// The current implementation uses the presence of an AssemblyRef for the target module's assembly in
Expand Down Expand Up @@ -3156,7 +3156,7 @@ BOOL Module::IsInSameVersionBubble(Module *target)

return FALSE;
}
#endif // FEATURE_READYTORUN && !FEATURE_READYTORUN_COMPILER
#endif // FEATURE_READYTORUN

//---------------------------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/ceeload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,9 +1779,9 @@ class Module

BOOL IsInCurrentVersionBubble();

#if defined(FEATURE_READYTORUN) && !defined(FEATURE_READYTORUN_COMPILER)
#if defined(FEATURE_READYTORUN)
BOOL IsInSameVersionBubble(Module *target);
#endif // FEATURE_READYTORUN && !FEATURE_READYTORUN_COMPILER
#endif // FEATURE_READYTORUN


LPCWSTR GetPathForErrorMessages();
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/classcompat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ VOID MethodTableBuilder::BuildInteropVTable_ExpandInterface(InterfaceInfo_t *pIn
MethodTable *pItf = it.GetInterfaceApprox();
if (pItf->HasInstantiation() || pItf->IsSpecialMarkerTypeForGenericCasting())
continue;

BuildInteropVTable_ExpandInterface(pInterfaceMap, pItf,
pwInterfaceListSize, pdwMaxInterfaceMethods, FALSE);
}
Expand Down Expand Up @@ -2594,7 +2594,7 @@ VOID MethodTableBuilder::EnumerateClassMethods()
if (fIsClassInterface
#if defined(FEATURE_DEFAULT_INTERFACES)
// Only fragile crossgen wasn't upgraded to deal with default interface methods.
&& !IsReadyToRunCompilation() && !IsNgenPDBCompilationProcess()
&& !IsNgenPDBCompilationProcess()
#endif
)
{
Expand Down
15 changes: 1 addition & 14 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ class ILStubState : public StubState
DWORD dwMethodDescLocalNum = (DWORD)-1;

// Notify the profiler of call out of the runtime
if (!SF_IsReverseCOMStub(m_dwStubFlags) && !SF_IsStructMarshalStub(m_dwStubFlags) && (CORProfilerTrackTransitions() || (!IsReadyToRunCompilation() && SF_IsNGENedStubForProfiling(m_dwStubFlags))))
if (!SF_IsReverseCOMStub(m_dwStubFlags) && !SF_IsStructMarshalStub(m_dwStubFlags) && (CORProfilerTrackTransitions() || SF_IsNGENedStubForProfiling(m_dwStubFlags)))
{
dwMethodDescLocalNum = m_slIL.EmitProfilerBeginTransitionCallback(pcsDispatch, m_dwStubFlags);
_ASSERTE(dwMethodDescLocalNum != (DWORD)-1);
Expand Down Expand Up @@ -3399,13 +3399,6 @@ BOOL NDirect::MarshalingRequired(
return TRUE;
}

#ifdef FEATURE_READYTORUN_COMPILER
if (IsReadyToRunCompilation())
{
if (!hndArgType.AsMethodTable()->IsLayoutInCurrentVersionBubble())
return TRUE;
}
#endif
if (i > 0)
{
const bool isValueType = true;
Expand Down Expand Up @@ -5321,12 +5314,6 @@ MethodDesc* NDirect::CreateStructMarshalILStub(MethodTable* pMT)
}
CONTRACT_END;

if (IsReadyToRunCompilation())
{
// We don't support emitting struct marshalling IL stubs into R2R images.
ThrowHR(E_FAIL);
}

DWORD dwStubFlags = NDIRECTSTUB_FL_STRUCT_MARSHAL;

BOOL bestFit, throwOnUnmappableChar;
Expand Down
Loading