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

[x86/Linux] Enclose ArrayOpStub Exceptions with FEATURE_ARRAYSTUB_AS_IL #8445

Merged
merged 3 commits into from
Dec 5, 2016
Merged

[x86/Linux] Enclose ArrayOpStub Exceptions with FEATURE_ARRAYSTUB_AS_IL #8445

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d8dd7a
Enclose ArrayOpStub Exceptions with FEATURE_ARRAYSTUB_AS_IL
parjong Dec 5, 2016
d9497a5
Fix unmatched ifdef
parjong Dec 5, 2016
c2525f2
Fix unmatched ifdef
parjong Dec 5, 2016
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
8 changes: 6 additions & 2 deletions src/vm/i386/stublinkerx86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ extern "C" HRESULT __cdecl StubRareDisableHR(Thread *pThread);
#endif // FEATURE_COMINTEROP
extern "C" VOID __cdecl StubRareDisableTHROW(Thread *pThread, Frame *pFrame);

#ifndef FEATURE_ARRAYSTUB_AS_IL
extern "C" VOID __cdecl ArrayOpStubNullException(void);
extern "C" VOID __cdecl ArrayOpStubRangeException(void);
extern "C" VOID __cdecl ArrayOpStubTypeMismatchException(void);
Expand All @@ -78,10 +79,13 @@ EXCEPTION_HELPERS(ArrayOpStubNullException);
EXCEPTION_HELPERS(ArrayOpStubRangeException);
EXCEPTION_HELPERS(ArrayOpStubTypeMismatchException);
#undef EXCEPTION_HELPERS
#endif // !_TARGET_AMD64_
#endif // !FEATURE_ARRAYSTUB_AS_IL

#if defined(_DEBUG)
#if defined(_TARGET_AMD64_)
#if defined(_DEBUG)
extern "C" VOID __cdecl DebugCheckStubUnwindInfo();
#endif
#endif // _DEBUG
#endif // _TARGET_AMD64_

// Presumably this code knows what it is doing with TLS. If we are hiding these
Expand Down