Skip to content
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

Jump to bottom

Don't probe for A/W variants of entry points on non-Windows. #33250

Merged
merged 4 commits into from
Mar 11, 2020
Merged

Don't probe for A/W variants of entry points on non-Windows. #33250

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6b7187
Don't probe for A/W variants of entry points on non-Windows.
jkoritzinsky Mar 5, 2020
2b9deaa
Cal PAL_GetProcAddressDirect directly on Unix.
jkoritzinsky Mar 5, 2020
33233ab
PR Feedback and update the ExactSpelling test to test this new behavior.
jkoritzinsky Mar 5, 2020
aad62c1
Remove dependence on A/W probing on non-Windows.
jkoritzinsky Mar 5, 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
9 changes: 7 additions & 2 deletions src/coreclr/src/vm/method.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5325,7 +5325,7 @@ LPVOID NDirectMethodDesc::FindEntryPoint(NATIVE_LIBRARY_HANDLE hMod) const

FARPROC pFunc = NULL;

#ifndef TARGET_UNIX
#ifdef TARGET_WINDOWS
// Handle ordinals.
if (funcName[0] == '#')
{
Expand All @@ -5334,10 +5334,14 @@ LPVOID NDirectMethodDesc::FindEntryPoint(NATIVE_LIBRARY_HANDLE hMod) const
}
#endif

// Just look for the user-provided name without charset suffixes. If it is unicode fcn, we are going
// Just look for the user-provided name without charset suffixes.
// If we are targetting Windows and it is unicode fcn, we are going
// to need to check for the 'W' API because it takes precedence over the
// unmangled one (on NT some APIs have unmangled ANSI exports).
pFunc = FindEntryPointWithMangling(hMod, funcName);
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
#ifndef TARGET_WINDOWS
return reinterpret_cast<LPVOID>(pFunc);
#else
if ((pFunc != NULL && IsNativeAnsi()) || IsNativeNoMangled())
{
return reinterpret_cast<LPVOID>(pFunc);
Expand Down Expand Up @@ -5369,6 +5373,7 @@ LPVOID NDirectMethodDesc::FindEntryPoint(NATIVE_LIBRARY_HANDLE hMod) const
}

return reinterpret_cast<LPVOID>(pFunc);
#endif
}
#endif // CROSSGEN_COMPILE

Expand Down