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

[x86/Linux] Re-enable UMThkCallFrame and fix compile errors #8411

Merged
merged 1 commit into from
Dec 1, 2016
Merged

[x86/Linux] Re-enable UMThkCallFrame and fix compile errors #8411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/inc/vptr_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ VPTR_CLASS(StubHelperFrame)
#ifdef FEATURE_REMOTING
VPTR_CLASS(TPMethodFrame)
#endif
#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
#if defined(_TARGET_X86_)
VPTR_CLASS(UMThkCallFrame)
#endif
VPTR_CLASS(TailCallFrame)
Expand Down
12 changes: 6 additions & 6 deletions src/vm/frames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
// | +-ComPrestubMethodFrame - prestub frame for calls from COM to CLR
// |
#endif //FEATURE_COMINTEROP
#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
#if defined(_TARGET_X86_)
// | +-UMThkCallFrame - this frame represents an unmanaged->managed
// | transition through N/Direct
#endif
Expand Down Expand Up @@ -268,7 +268,7 @@ FRAME_TYPE_NAME(DebuggerClassInitMarkFrame)
FRAME_TYPE_NAME(DebuggerSecurityCodeMarkFrame)
FRAME_TYPE_NAME(DebuggerExitFrame)
FRAME_TYPE_NAME(DebuggerU2MCatchHandlerFrame)
#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
#if defined(_TARGET_X86_)
FRAME_TYPE_NAME(UMThkCallFrame)
#endif
#if defined(FEATURE_INCLUDE_ALL_INTERFACES) && defined(_TARGET_X86_)
Expand Down Expand Up @@ -1907,7 +1907,7 @@ class UnmanagedToManagedFrame : public Frame
{
friend class CheckAsmOffsets;

VPTR_ABSTRACT_VTABLE_CLASS(UnmanagedToManagedFrame, Frame)
VPTR_ABSTRACT_VTABLE_CLASS_AND_CTOR(UnmanagedToManagedFrame, Frame)

public:

Expand Down Expand Up @@ -2899,7 +2899,7 @@ typedef DPTR(class UMThunkMarshInfo) PTR_UMThunkMarshInfo;
class UMEntryThunk;
typedef DPTR(class UMEntryThunk) PTR_UMEntryThunk;

#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
#if defined(_TARGET_X86_)
//------------------------------------------------------------------------
// This frame guards an unmanaged->managed transition thru a UMThk
//------------------------------------------------------------------------
Expand Down Expand Up @@ -2929,7 +2929,7 @@ class UMThkCallFrame : public UnmanagedToManagedFrame
};
#endif // _TARGET_X86_ && !FEATURE_PAL

#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
#if defined(_TARGET_X86_)
//-------------------------------------------------------------------------
// Exception handler for COM to managed frame
// and the layout of the exception registration record structure in the stack
Expand All @@ -2949,7 +2949,7 @@ struct ComToManagedExRecord
return &m_frame;
}
};
#endif // _TARGET_X86_ && !FEATURE_PAL
#endif // _TARGET_X86_

#if defined(FEATURE_INCLUDE_ALL_INTERFACES) && defined(_TARGET_X86_)
//-----------------------------------------------------------------------------
Expand Down