Skip to content

Commit 712b878

Browse files
jkotasjkotas
authored
Delete token scanning from JIT/EE interface (#79964)
Token scanning was left-over from appdomains. It is not needed and it has subtle bugs that libraries tests started hitting recently. Fixes #79439
1 parent 88868b7 commit 712b878

18 files changed

+57
-474
lines changed

‎src/coreclr/inc/corinfo.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,13 +3258,6 @@ class ICorDynamicInfo : public ICorStaticInfo
32583258
void **ppIndirection = NULL
32593259
) = 0;
32603260

3261-
// Adds an active dependency from the context method's module to the given module
3262-
// This is internal callback for the EE. JIT should not call it directly.
3263-
virtual void addActiveDependency(
3264-
CORINFO_MODULE_HANDLE moduleFrom,
3265-
CORINFO_MODULE_HANDLE moduleTo
3266-
) = 0;
3267-
32683261
virtual CORINFO_METHOD_HANDLE GetDelegateCtor(
32693262
CORINFO_METHOD_HANDLE methHnd,
32703263
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/inc/icorjitinfoimpl_generated.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,10 +647,6 @@ uint32_t getFieldThreadLocalStoreID(
647647
CORINFO_FIELD_HANDLE field,
648648
void** ppIndirection) override;
649649

650-
void addActiveDependency(
651-
CORINFO_MODULE_HANDLE moduleFrom,
652-
CORINFO_MODULE_HANDLE moduleTo) override;
653-
654650
CORINFO_METHOD_HANDLE GetDelegateCtor(
655651
CORINFO_METHOD_HANDLE methHnd,
656652
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/inc/jiteeversionguid.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
4343
#define GUID_DEFINED
4444
#endif // !GUID_DEFINED
4545

46-
constexpr GUID JITEEVersionIdentifier = { /* fd13d4e1-9815-4336-8232-b27878b9ebd4 */
47-
0xfd13d4e1,
48-
0x9815,
49-
0x4336,
50-
{0x82, 0x32, 0xb2, 0x78, 0x78, 0xb9, 0xeb, 0xd4}
46+
constexpr GUID JITEEVersionIdentifier = { /* 9c013880-b9b8-4f91-bea4-d4dd4368ab93 */
47+
0x9c013880,
48+
0xb9b8,
49+
0x4f91,
50+
{0xbe, 0xa4, 0xd4, 0xdd, 0x43, 0x68, 0xab, 0x93}
5151
};
5252

5353
//////////////////////////////////////////////////////////////////////////////////////////////////////////

‎src/coreclr/jit/ICorJitInfo_names_generated.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ DEF_CLR_API(canGetVarArgsHandle)
161161
DEF_CLR_API(constructStringLiteral)
162162
DEF_CLR_API(emptyStringLiteral)
163163
DEF_CLR_API(getFieldThreadLocalStoreID)
164-
DEF_CLR_API(addActiveDependency)
165164
DEF_CLR_API(GetDelegateCtor)
166165
DEF_CLR_API(MethodCompileComplete)
167166
DEF_CLR_API(getTailCallHelpers)

‎src/coreclr/jit/ICorJitInfo_wrapper_generated.hpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,15 +1546,6 @@ uint32_t WrapICorJitInfo::getFieldThreadLocalStoreID(
15461546
return temp;
15471547
}
15481548

1549-
void WrapICorJitInfo::addActiveDependency(
1550-
CORINFO_MODULE_HANDLE moduleFrom,
1551-
CORINFO_MODULE_HANDLE moduleTo)
1552-
{
1553-
API_ENTER(addActiveDependency);
1554-
wrapHnd->addActiveDependency(moduleFrom, moduleTo);
1555-
API_LEAVE(addActiveDependency);
1556-
}
1557-
15581549
CORINFO_METHOD_HANDLE WrapICorJitInfo::GetDelegateCtor(
15591550
CORINFO_METHOD_HANDLE methHnd,
15601551
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3389,8 +3389,6 @@ private InfoAccessType emptyStringLiteral(ref void* ppValue)
33893389

33903390
private uint getFieldThreadLocalStoreID(CORINFO_FIELD_STRUCT_* field, ref void* ppIndirection)
33913391
{ throw new NotImplementedException("getFieldThreadLocalStoreID"); }
3392-
private void addActiveDependency(CORINFO_MODULE_STRUCT_* moduleFrom, CORINFO_MODULE_STRUCT_* moduleTo)
3393-
{ throw new NotImplementedException("addActiveDependency"); }
33943392
private CORINFO_METHOD_STRUCT_* GetDelegateCtor(CORINFO_METHOD_STRUCT_* methHnd, CORINFO_CLASS_STRUCT_* clsHnd, CORINFO_METHOD_STRUCT_* targetMethodHnd, ref DelegateCtorArgs pCtorData)
33953393
{ throw new NotImplementedException("GetDelegateCtor"); }
33963394
private void MethodCompileComplete(CORINFO_METHOD_STRUCT_* methHnd)

‎src/coreclr/tools/Common/JitInterface/CorInfoImpl_generated.cs

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,20 +2333,6 @@ private static uint _getFieldThreadLocalStoreID(IntPtr thisHandle, IntPtr* ppExc
23332333
}
23342334
}
23352335

2336-
[UnmanagedCallersOnly]
2337-
private static void _addActiveDependency(IntPtr thisHandle, IntPtr* ppException, CORINFO_MODULE_STRUCT_* moduleFrom, CORINFO_MODULE_STRUCT_* moduleTo)
2338-
{
2339-
var _this = GetThis(thisHandle);
2340-
try
2341-
{
2342-
_this.addActiveDependency(moduleFrom, moduleTo);
2343-
}
2344-
catch (Exception ex)
2345-
{
2346-
*ppException = _this.AllocException(ex);
2347-
}
2348-
}
2349-
23502336
[UnmanagedCallersOnly]
23512337
private static CORINFO_METHOD_STRUCT_* _GetDelegateCtor(IntPtr thisHandle, IntPtr* ppException, CORINFO_METHOD_STRUCT_* methHnd, CORINFO_CLASS_STRUCT_* clsHnd, CORINFO_METHOD_STRUCT_* targetMethodHnd, DelegateCtorArgs* pCtorData)
23522338
{
@@ -2670,7 +2656,7 @@ private static uint _getJitFlags(IntPtr thisHandle, IntPtr* ppException, CORJIT_
26702656

26712657
private static IntPtr GetUnmanagedCallbacks()
26722658
{
2673-
void** callbacks = (void**)Marshal.AllocCoTaskMem(sizeof(IntPtr) * 180);
2659+
void** callbacks = (void**)Marshal.AllocCoTaskMem(sizeof(IntPtr) * 179);
26742660

26752661
callbacks[0] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, byte>)&_isIntrinsic;
26762662
callbacks[1] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, uint>)&_getMethodAttribs;
@@ -2829,29 +2815,28 @@ private static IntPtr GetUnmanagedCallbacks()
28292815
callbacks[154] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_MODULE_STRUCT_*, mdToken, void**, InfoAccessType>)&_constructStringLiteral;
28302816
callbacks[155] = (delegate* unmanaged<IntPtr, IntPtr*, void**, InfoAccessType>)&_emptyStringLiteral;
28312817
callbacks[156] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_FIELD_STRUCT_*, void**, uint>)&_getFieldThreadLocalStoreID;
2832-
callbacks[157] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_MODULE_STRUCT_*, CORINFO_MODULE_STRUCT_*, void>)&_addActiveDependency;
2833-
callbacks[158] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, CORINFO_CLASS_STRUCT_*, CORINFO_METHOD_STRUCT_*, DelegateCtorArgs*, CORINFO_METHOD_STRUCT_*>)&_GetDelegateCtor;
2834-
callbacks[159] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, void>)&_MethodCompileComplete;
2835-
callbacks[160] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_RESOLVED_TOKEN*, CORINFO_SIG_INFO*, CORINFO_GET_TAILCALL_HELPERS_FLAGS, CORINFO_TAILCALL_HELPERS*, byte>)&_getTailCallHelpers;
2836-
callbacks[161] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_RESOLVED_TOKEN*, byte, byte>)&_convertPInvokeCalliToCall;
2837-
callbacks[162] = (delegate* unmanaged<IntPtr, IntPtr*, InstructionSet, byte, byte>)&_notifyInstructionSetUsage;
2838-
callbacks[163] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_CONST_LOOKUP*, void>)&_updateEntryPointForTailCall;
2839-
callbacks[164] = (delegate* unmanaged<IntPtr, IntPtr*, AllocMemArgs*, void>)&_allocMem;
2840-
callbacks[165] = (delegate* unmanaged<IntPtr, IntPtr*, byte, byte, uint, void>)&_reserveUnwindInfo;
2841-
callbacks[166] = (delegate* unmanaged<IntPtr, IntPtr*, byte*, byte*, uint, uint, uint, byte*, CorJitFuncKind, void>)&_allocUnwindInfo;
2842-
callbacks[167] = (delegate* unmanaged<IntPtr, IntPtr*, UIntPtr, void*>)&_allocGCInfo;
2843-
callbacks[168] = (delegate* unmanaged<IntPtr, IntPtr*, uint, void>)&_setEHcount;
2844-
callbacks[169] = (delegate* unmanaged<IntPtr, IntPtr*, uint, CORINFO_EH_CLAUSE*, void>)&_setEHinfo;
2845-
callbacks[170] = (delegate* unmanaged<IntPtr, IntPtr*, uint, byte*, IntPtr, byte>)&_logMsg;
2846-
callbacks[171] = (delegate* unmanaged<IntPtr, IntPtr*, byte*, int, byte*, int>)&_doAssert;
2847-
callbacks[172] = (delegate* unmanaged<IntPtr, IntPtr*, CorJitResult, void>)&_reportFatalError;
2848-
callbacks[173] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, PgoInstrumentationSchema**, uint*, byte**, PgoSource*, HRESULT>)&_getPgoInstrumentationResults;
2849-
callbacks[174] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, PgoInstrumentationSchema*, uint, byte**, HRESULT>)&_allocPgoInstrumentationBySchema;
2850-
callbacks[175] = (delegate* unmanaged<IntPtr, IntPtr*, uint, CORINFO_SIG_INFO*, CORINFO_METHOD_STRUCT_*, void>)&_recordCallSite;
2851-
callbacks[176] = (delegate* unmanaged<IntPtr, IntPtr*, void*, void*, void*, ushort, ushort, int, void>)&_recordRelocation;
2852-
callbacks[177] = (delegate* unmanaged<IntPtr, IntPtr*, void*, ushort>)&_getRelocTypeHint;
2853-
callbacks[178] = (delegate* unmanaged<IntPtr, IntPtr*, uint>)&_getExpectedTargetArchitecture;
2854-
callbacks[179] = (delegate* unmanaged<IntPtr, IntPtr*, CORJIT_FLAGS*, uint, uint>)&_getJitFlags;
2818+
callbacks[157] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, CORINFO_CLASS_STRUCT_*, CORINFO_METHOD_STRUCT_*, DelegateCtorArgs*, CORINFO_METHOD_STRUCT_*>)&_GetDelegateCtor;
2819+
callbacks[158] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, void>)&_MethodCompileComplete;
2820+
callbacks[159] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_RESOLVED_TOKEN*, CORINFO_SIG_INFO*, CORINFO_GET_TAILCALL_HELPERS_FLAGS, CORINFO_TAILCALL_HELPERS*, byte>)&_getTailCallHelpers;
2821+
callbacks[160] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_RESOLVED_TOKEN*, byte, byte>)&_convertPInvokeCalliToCall;
2822+
callbacks[161] = (delegate* unmanaged<IntPtr, IntPtr*, InstructionSet, byte, byte>)&_notifyInstructionSetUsage;
2823+
callbacks[162] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_CONST_LOOKUP*, void>)&_updateEntryPointForTailCall;
2824+
callbacks[163] = (delegate* unmanaged<IntPtr, IntPtr*, AllocMemArgs*, void>)&_allocMem;
2825+
callbacks[164] = (delegate* unmanaged<IntPtr, IntPtr*, byte, byte, uint, void>)&_reserveUnwindInfo;
2826+
callbacks[165] = (delegate* unmanaged<IntPtr, IntPtr*, byte*, byte*, uint, uint, uint, byte*, CorJitFuncKind, void>)&_allocUnwindInfo;
2827+
callbacks[166] = (delegate* unmanaged<IntPtr, IntPtr*, UIntPtr, void*>)&_allocGCInfo;
2828+
callbacks[167] = (delegate* unmanaged<IntPtr, IntPtr*, uint, void>)&_setEHcount;
2829+
callbacks[168] = (delegate* unmanaged<IntPtr, IntPtr*, uint, CORINFO_EH_CLAUSE*, void>)&_setEHinfo;
2830+
callbacks[169] = (delegate* unmanaged<IntPtr, IntPtr*, uint, byte*, IntPtr, byte>)&_logMsg;
2831+
callbacks[170] = (delegate* unmanaged<IntPtr, IntPtr*, byte*, int, byte*, int>)&_doAssert;
2832+
callbacks[171] = (delegate* unmanaged<IntPtr, IntPtr*, CorJitResult, void>)&_reportFatalError;
2833+
callbacks[172] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, PgoInstrumentationSchema**, uint*, byte**, PgoSource*, HRESULT>)&_getPgoInstrumentationResults;
2834+
callbacks[173] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, PgoInstrumentationSchema*, uint, byte**, HRESULT>)&_allocPgoInstrumentationBySchema;
2835+
callbacks[174] = (delegate* unmanaged<IntPtr, IntPtr*, uint, CORINFO_SIG_INFO*, CORINFO_METHOD_STRUCT_*, void>)&_recordCallSite;
2836+
callbacks[175] = (delegate* unmanaged<IntPtr, IntPtr*, void*, void*, void*, ushort, ushort, int, void>)&_recordRelocation;
2837+
callbacks[176] = (delegate* unmanaged<IntPtr, IntPtr*, void*, ushort>)&_getRelocTypeHint;
2838+
callbacks[177] = (delegate* unmanaged<IntPtr, IntPtr*, uint>)&_getExpectedTargetArchitecture;
2839+
callbacks[178] = (delegate* unmanaged<IntPtr, IntPtr*, CORJIT_FLAGS*, uint, uint>)&_getJitFlags;
28552840

28562841
return (IntPtr)callbacks;
28572842
}

‎src/coreclr/tools/Common/JitInterface/ThunkGenerator/ThunkInput.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ FUNCTIONS
314314
InfoAccessType constructStringLiteral(CORINFO_MODULE_HANDLE module, mdToken metaTok, void **ppValue);
315315
InfoAccessType emptyStringLiteral(void **ppValue);
316316
uint32_t getFieldThreadLocalStoreID (CORINFO_FIELD_HANDLE field, void **ppIndirection);
317-
void addActiveDependency(CORINFO_MODULE_HANDLE moduleFrom, CORINFO_MODULE_HANDLE moduleTo);
318317
CORINFO_METHOD_HANDLE GetDelegateCtor(CORINFO_METHOD_HANDLE methHnd, CORINFO_CLASS_HANDLE clsHnd, CORINFO_METHOD_HANDLE targetMethodHnd, DelegateCtorArgs * pCtorData);
319318
void MethodCompileComplete(CORINFO_METHOD_HANDLE methHnd);
320319
bool getTailCallHelpers(CORINFO_RESOLVED_TOKEN* callToken, CORINFO_SIG_INFO* sig, CORINFO_GET_TAILCALL_HELPERS_FLAGS flags, CORINFO_TAILCALL_HELPERS* pResult);

‎src/coreclr/tools/aot/jitinterface/jitinterface_generated.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ struct JitInterfaceCallbacks
168168
InfoAccessType (* constructStringLiteral)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_MODULE_HANDLE module, unsigned int metaTok, void** ppValue);
169169
InfoAccessType (* emptyStringLiteral)(void * thisHandle, CorInfoExceptionClass** ppException, void** ppValue);
170170
uint32_t (* getFieldThreadLocalStoreID)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_FIELD_HANDLE field, void** ppIndirection);
171-
void (* addActiveDependency)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_MODULE_HANDLE moduleFrom, CORINFO_MODULE_HANDLE moduleTo);
172171
CORINFO_METHOD_HANDLE (* GetDelegateCtor)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_METHOD_HANDLE methHnd, CORINFO_CLASS_HANDLE clsHnd, CORINFO_METHOD_HANDLE targetMethodHnd, DelegateCtorArgs* pCtorData);
173172
void (* MethodCompileComplete)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_METHOD_HANDLE methHnd);
174173
bool (* getTailCallHelpers)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_RESOLVED_TOKEN* callToken, CORINFO_SIG_INFO* sig, CORINFO_GET_TAILCALL_HELPERS_FLAGS flags, CORINFO_TAILCALL_HELPERS* pResult);
@@ -1722,15 +1721,6 @@ class JitInterfaceWrapper : public ICorJitInfo
17221721
return temp;
17231722
}
17241723

1725-
virtual void addActiveDependency(
1726-
CORINFO_MODULE_HANDLE moduleFrom,
1727-
CORINFO_MODULE_HANDLE moduleTo)
1728-
{
1729-
CorInfoExceptionClass* pException = nullptr;
1730-
_callbacks->addActiveDependency(_thisHandle, &pException, moduleFrom, moduleTo);
1731-
if (pException != nullptr) throw pException;
1732-
}
1733-
17341724
virtual CORINFO_METHOD_HANDLE GetDelegateCtor(
17351725
CORINFO_METHOD_HANDLE methHnd,
17361726
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,14 +1772,6 @@ uint32_t interceptor_ICJI::getFieldThreadLocalStoreID(CORINFO_FIELD_HANDLE field
17721772
return temp;
17731773
}
17741774

1775-
// Adds an active dependency from the context method's module to the given module
1776-
// This is internal callback for the EE. JIT should not call it directly.
1777-
void interceptor_ICJI::addActiveDependency(CORINFO_MODULE_HANDLE moduleFrom, CORINFO_MODULE_HANDLE moduleTo)
1778-
{
1779-
mc->cr->AddCall("addActiveDependency");
1780-
original_ICorJitInfo->addActiveDependency(moduleFrom, moduleTo);
1781-
}
1782-
17831775
CORINFO_METHOD_HANDLE interceptor_ICJI::GetDelegateCtor(CORINFO_METHOD_HANDLE methHnd,
17841776
CORINFO_CLASS_HANDLE clsHnd,
17851777
CORINFO_METHOD_HANDLE targetMethodHnd,

‎src/coreclr/tools/superpmi/superpmi-shim-counter/icorjitinfo_generated.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,14 +1266,6 @@ uint32_t interceptor_ICJI::getFieldThreadLocalStoreID(
12661266
return original_ICorJitInfo->getFieldThreadLocalStoreID(field, ppIndirection);
12671267
}
12681268

1269-
void interceptor_ICJI::addActiveDependency(
1270-
CORINFO_MODULE_HANDLE moduleFrom,
1271-
CORINFO_MODULE_HANDLE moduleTo)
1272-
{
1273-
mcs->AddCall("addActiveDependency");
1274-
original_ICorJitInfo->addActiveDependency(moduleFrom, moduleTo);
1275-
}
1276-
12771269
CORINFO_METHOD_HANDLE interceptor_ICJI::GetDelegateCtor(
12781270
CORINFO_METHOD_HANDLE methHnd,
12791271
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/tools/superpmi/superpmi-shim-simple/icorjitinfo_generated.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,13 +1109,6 @@ uint32_t interceptor_ICJI::getFieldThreadLocalStoreID(
11091109
return original_ICorJitInfo->getFieldThreadLocalStoreID(field, ppIndirection);
11101110
}
11111111

1112-
void interceptor_ICJI::addActiveDependency(
1113-
CORINFO_MODULE_HANDLE moduleFrom,
1114-
CORINFO_MODULE_HANDLE moduleTo)
1115-
{
1116-
original_ICorJitInfo->addActiveDependency(moduleFrom, moduleTo);
1117-
}
1118-
11191112
CORINFO_METHOD_HANDLE interceptor_ICJI::GetDelegateCtor(
11201113
CORINFO_METHOD_HANDLE methHnd,
11211114
CORINFO_CLASS_HANDLE clsHnd,

‎src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,15 +1531,6 @@ uint32_t MyICJI::getFieldThreadLocalStoreID(CORINFO_FIELD_HANDLE field, void** p
15311531
return jitInstance->mc->repGetFieldThreadLocalStoreID(field, ppIndirection);
15321532
}
15331533

1534-
// Adds an active dependency from the context method's module to the given module
1535-
// This is internal callback for the EE. JIT should not call it directly.
1536-
void MyICJI::addActiveDependency(CORINFO_MODULE_HANDLE moduleFrom, CORINFO_MODULE_HANDLE moduleTo)
1537-
{
1538-
jitInstance->mc->cr->AddCall("addActiveDependency");
1539-
LogError("Hit unimplemented addActiveDependency");
1540-
DebugBreakorAV(116);
1541-
}
1542-
15431534
CORINFO_METHOD_HANDLE MyICJI::GetDelegateCtor(CORINFO_METHOD_HANDLE methHnd,
15441535
CORINFO_CLASS_HANDLE clsHnd,
15451536
CORINFO_METHOD_HANDLE targetMethodHnd,

‎src/coreclr/vm/ceeload.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2906,23 +2906,6 @@ BYTE *Module::GetProfilerBase()
29062906
}
29072907
}
29082908

2909-
void Module::AddActiveDependency(Module *pModule, BOOL unconditional)
2910-
{
2911-
CONTRACT_VOID
2912-
{
2913-
THROWS;
2914-
GC_TRIGGERS;
2915-
PRECONDITION(CheckPointer(pModule));
2916-
PRECONDITION(pModule != this);
2917-
PRECONDITION(!IsSystem());
2918-
// Postcondition about activation
2919-
}
2920-
CONTRACT_END;
2921-
2922-
pModule->EnsureActive();
2923-
RETURN;
2924-
}
2925-
29262909
#endif //!DACCESS_COMPILE
29272910

29282911
Assembly *

‎src/coreclr/vm/ceeload.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,33 +1532,6 @@ class Module : public ModuleBase
15321532

15331533
BYTE *GetProfilerBase();
15341534

1535-
1536-
// Active transition path management
1537-
//
1538-
// This list keeps track of module which we have active transition
1539-
// paths to. An active transition path is where we move from
1540-
// active execution in one module to another module without
1541-
// involving triggering the file loader to ensure that the
1542-
// destination module is active. We must explicitly list these
1543-
// relationships so the loader can ensure that the activation
1544-
// constraints are a priori satisfied.
1545-
//
1546-
// Conditional vs. Unconditional describes how we deal with
1547-
// activation failure of a dependency. In the unconditional case,
1548-
// we propagate the activation failure to the depending module.
1549-
// In the conditional case, we activate a "trigger" in the active
1550-
// transition path which will cause the path to fail in particular
1551-
// app domains where the destination module failed to activate.
1552-
// (This trigger in the path typically has a perf cost even in the
1553-
// nonfailing case.)
1554-
//
1555-
// In either case we must try to perform the activation eagerly -
1556-
// even in the conditional case we have to know whether to turn on
1557-
// the trigger or not before we let the active transition path
1558-
// execute.
1559-
1560-
void AddActiveDependency(Module *pModule, BOOL unconditional);
1561-
15621535
BYTE* GetNativeFixupBlobData(RVA fixup);
15631536

15641537
IMDInternalImport *GetNativeAssemblyImport(BOOL loadAllowed = TRUE);

‎src/coreclr/vm/interpreter.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -723,14 +723,6 @@ class InterpreterCEEInfo: public CEEInfo
723723
CEEJitInfo m_jitInfo;
724724
public:
725725
InterpreterCEEInfo(CORINFO_METHOD_HANDLE meth): CEEInfo((MethodDesc*)meth), m_jitInfo((MethodDesc*)meth, NULL, NULL, CORJIT_FLAGS::CORJIT_FLAG_SPEED_OPT) { }
726-
727-
// Certain methods are unimplemented by CEEInfo (they hit an assert). They are implemented by CEEJitInfo, yet
728-
// don't seem to require any of the CEEJitInfo state we can't provide. For those case, delegate to the "partial"
729-
// CEEJitInfo m_jitInfo.
730-
void addActiveDependency(CORINFO_MODULE_HANDLE moduleFrom,CORINFO_MODULE_HANDLE moduleTo)
731-
{
732-
m_jitInfo.addActiveDependency(moduleFrom, moduleTo);
733-
}
734726
};
735727

736728
extern INT64 F_CALL_CONV InterpretMethod(InterpreterMethodInfo* methInfo, BYTE* ilArgs, void* stubContext);

0 commit comments

Comments
 (0)