Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
[x86/Linux] Use Portable FastGetDomain (#8556)
Browse files Browse the repository at this point in the history
FastGetDomain function (with  __declspec(naked)) causes segmentation
fault.
  • Loading branch information
parjong authored and janvorli committed Dec 9, 2016
1 parent 101168c commit 13a829e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/vm/comsynchronizable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ FCIMPL0(Object*, ThreadNative::GetDomain)
}
FCIMPLEND

#ifdef _TARGET_X86_
#if defined(_TARGET_X86_) && defined(_MSC_VER)
__declspec(naked) LPVOID __fastcall ThreadNative::FastGetDomain()
{
STATIC_CONTRACT_MODE_COOPERATIVE;
Expand All @@ -1624,7 +1624,7 @@ __declspec(naked) LPVOID __fastcall ThreadNative::FastGetDomain()
ret
}
}
#else // _TARGET_X86_
#else // _TARGET_X86_ && _MSC_VER
LPVOID F_CALL_CONV ThreadNative::FastGetDomain()
{
CONTRACTL
Expand All @@ -1650,7 +1650,7 @@ LPVOID F_CALL_CONV ThreadNative::FastGetDomain()
}
return NULL;
}
#endif // _TARGET_X86_
#endif // _TARGET_X86_ && _MSC_VER

#ifdef FEATURE_REMOTING
// This is just a helper method that lets BCL get to the managed context
Expand Down

0 comments on commit 13a829e

Please sign in to comment.