diff options
| author | Steve MacLean <sdmaclea.qdt@qualcommdatacenter.com> | 2018-04-23 21:39:24 -0400 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-04-23 18:39:24 -0700 |
| commit | 5ebaadf50f99050591a6a987888ef9077cf2050b (patch) | |
| tree | 56b041ce3ebb132089b47cfda93b8013b19021f6 /src/vm/stubhelpers.cpp | |
| parent | 8c4a47196b18531ae387c289888f64f405bf2b29 (diff) | |
| download | coreclr-5ebaadf50f99050591a6a987888ef9077cf2050b.tar.gz coreclr-5ebaadf50f99050591a6a987888ef9077cf2050b.tar.bz2 coreclr-5ebaadf50f99050591a6a987888ef9077cf2050b.zip | |
GenericPInvokeCalli shift left then or 1 (#17734)
When _WIN64 is defined vm relies on the secret arg being
shifted left and orred with #1.
Revert part of changes from #17659 to fix dotnet/corefx#29266
Fix arm64 to match amd64
Simplify dllimport.cpp
Diffstat (limited to 'src/vm/stubhelpers.cpp')
| -rw-r--r-- | src/vm/stubhelpers.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/vm/stubhelpers.cpp b/src/vm/stubhelpers.cpp index 071c87966e..d43c065362 100644 --- a/src/vm/stubhelpers.cpp +++ b/src/vm/stubhelpers.cpp @@ -1166,6 +1166,7 @@ FCIMPL2(void*, StubHelpers::GetDelegateTarget, DelegateObject *pThisUNSAFE, UINT #if defined(_WIN64) UINT_PTR target = (UINT_PTR)orefThis->GetMethodPtrAux(); + // See code:GenericPInvokeCalliHelper // The lowest bit is used to distinguish between MD and target on 64-bit. target = (target << 1) | 1; |