Due to comdat folding some fcalls are pointing to same code. This fix ensures that...

Commit migrated from https://github.com/dotnet/coreclr/commit/473d6f1e7e30b56aaa7677da45163bc567210a62

diff --git a/src/coreclr/src/vm/runtimehandles.cpp b/src/coreclr/src/vm/runtimehandles.cpp
index 39600ca..68ad24c 100644 (file)
--- a/src/coreclr/src/vm/runtimehandles.cpp
+++ b/src/coreclr/src/vm/runtimehandles.cpp
@@ -328,7 +328,10 @@ FCIMPL3(void, RuntimeMethodHandle::CheckLinktimeDemands, ReflectMethodObject *pM
     CONTRACTL_END;
 
     if(!Security::IsTransparencyEnforcementEnabled())
+    {
+        FCUnique(0xb0);
         return;
+    }
 
     REFLECTMETHODREF refMethod = (REFLECTMETHODREF)ObjectToOBJECTREF(pMethodUNSAFE);
     REFLECTMODULEBASEREF refModule = (REFLECTMODULEBASEREF)ObjectToOBJECTREF(pModuleUNSAFE);
@@ -846,7 +849,10 @@ void QCALLTYPE RuntimeFieldHandle::CheckAttributeAccess(FieldDesc *pFD, QCall::M
     CONTRACTL_END;
     
     if(!Security::IsTransparencyEnforcementEnabled())
+    {
+        FCUnique(0xb1);
         return;
+    }
 
     BEGIN_QCALL;
 

diff --git a/src/coreclr/src/vm/stubhelpers.cpp b/src/coreclr/src/vm/stubhelpers.cpp
index abf2143..6e7fb49 100644 (file)
--- a/src/coreclr/src/vm/stubhelpers.cpp
+++ b/src/coreclr/src/vm/stubhelpers.cpp
@@ -2170,6 +2170,7 @@ FCIMPLEND
 FCIMPL2(void, StubHelpers::MulticastDebuggerTraceHelper, Object* element, INT32 count)
 {
     FCALL_CONTRACT;
+    FCUnique(0xa5);
 }
 FCIMPLEND
 #endif // FEATURE_STUBS_AS_IL