summaryrefslogtreecommitdiff
path: root/src/System.Private.CoreLib
diff options
context:
space:
mode:
authorStephen Toub <stoub@microsoft.com>2019-03-15 23:44:53 -0400
committerJan Kotas <jkotas@microsoft.com>2019-03-15 20:44:53 -0700
commit80bc24981159663c2a2dcda3c1b322c2f57abab8 (patch)
tree02dbf096c6bb4bd43d39d36887a76f8808a8f87b /src/System.Private.CoreLib
parent7445c892da3bfcc1ac2c9105eb3eda81b0a2ff29 (diff)
downloadcoreclr-80bc24981159663c2a2dcda3c1b322c2f57abab8.tar.gz
coreclr-80bc24981159663c2a2dcda3c1b322c2f57abab8.tar.bz2
coreclr-80bc24981159663c2a2dcda3c1b322c2f57abab8.zip
Rename private GetEntryAssembly QCall overload (#22396)
To avoid issues with existing private reflection-based code that now gets a parameter count mismatch exception. Also renamed GetExecutingAssembly for consistency.
Diffstat (limited to 'src/System.Private.CoreLib')
-rw-r--r--src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
index 7ed70e4cc2..c4e36b937f 100644
--- a/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
+++ b/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
@@ -55,12 +55,12 @@ namespace System.Reflection
}
[DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
- private static extern void GetExecutingAssembly(StackCrawlMarkHandle stackMark, ObjectHandleOnStack retAssembly);
+ private static extern void GetExecutingAssemblyNative(StackCrawlMarkHandle stackMark, ObjectHandleOnStack retAssembly);
internal static RuntimeAssembly GetExecutingAssembly(ref StackCrawlMark stackMark)
{
RuntimeAssembly retAssembly = null;
- GetExecutingAssembly(JitHelpers.GetStackCrawlMarkHandle(ref stackMark), JitHelpers.GetObjectHandleOnStack(ref retAssembly));
+ GetExecutingAssemblyNative(JitHelpers.GetStackCrawlMarkHandle(ref stackMark), JitHelpers.GetObjectHandleOnStack(ref retAssembly));
return retAssembly;
}
@@ -83,7 +83,7 @@ namespace System.Reflection
}
[DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
- private static extern void GetEntryAssembly(ObjectHandleOnStack retAssembly);
+ private static extern void GetEntryAssemblyNative(ObjectHandleOnStack retAssembly);
// internal test hook
private static bool s_forceNullEntryPoint = false;
@@ -94,7 +94,7 @@ namespace System.Reflection
return null;
RuntimeAssembly entryAssembly = null;
- GetEntryAssembly(JitHelpers.GetObjectHandleOnStack(ref entryAssembly));
+ GetEntryAssemblyNative(JitHelpers.GetObjectHandleOnStack(ref entryAssembly));
return entryAssembly;
}