[ARM32/Linux] Fix cross-architecture build error: T_CONTEXT (#8888)

confusion of T_CONTEXT and CONTEXT in projects
- cee_dac
- gc_wks

related issue: #8885

diff --git a/src/debug/daccess/dacfn.cpp b/src/debug/daccess/dacfn.cpp
index d8bae7746f879e704d990b8f67ec3562c3c6d77c..33dfa10b54c8b609539b62d9b8f4d2d55d166d70 100644 (file)
--- a/src/debug/daccess/dacfn.cpp
+++ b/src/debug/daccess/dacfn.cpp
@@ -219,7 +219,7 @@ DacWriteAll(TADDR addr, PVOID buffer, ULONG32 size, bool throwEx)
 
 #ifdef FEATURE_PAL
 HRESULT 
-DacVirtualUnwind(DWORD threadId, PCONTEXT context, PT_KNONVOLATILE_CONTEXT_POINTERS contextPointers)
+DacVirtualUnwind(DWORD threadId, PT_CONTEXT context, PT_KNONVOLATILE_CONTEXT_POINTERS contextPointers)
 {
     if (!g_dacImpl)
     {

diff --git a/src/inc/daccess.h b/src/inc/daccess.h
index 6d9fb3265f75e2f23caa3403b7a629d418b66496..3e3a62c7461a8e96379f7a981dc0cb8003d071e0 100644 (file)
--- a/src/inc/daccess.h
+++ b/src/inc/daccess.h
@@ -784,7 +784,7 @@ BOOL DacUnwindStackFrame(T_CONTEXT * pContext, T_KNONVOLATILE_CONTEXT_POINTERS*
 
 #if defined(FEATURE_PAL)
 // call back through data target to unwind out-of-process
-HRESULT DacVirtualUnwind(ULONG32 threadId, PCONTEXT context, PT_KNONVOLATILE_CONTEXT_POINTERS contextPointers);
+HRESULT DacVirtualUnwind(ULONG32 threadId, PT_CONTEXT context, PT_KNONVOLATILE_CONTEXT_POINTERS contextPointers);
 #endif // FEATURE_PAL
 
 #ifdef FEATURE_MINIMETADATA_IN_TRIAGEDUMPS

diff --git a/src/vm/stubmgr.h b/src/vm/stubmgr.h
index f0098c9d550f4df736dfd27b569154741942caf7..10cba00de7d2cee240ccde570fbc4ecf14931bd7 100644 (file)
--- a/src/vm/stubmgr.h
+++ b/src/vm/stubmgr.h
@@ -445,7 +445,7 @@ class PrecodeStubManager : public StubManager
 #ifndef DACCESS_COMPILE
     virtual BOOL TraceManager(Thread *thread,
                               TraceDestination *trace,
-                              CONTEXT *pContext,
+                              T_CONTEXT *pContext,
                               BYTE **pRetAddr);
 #endif
 
@@ -509,7 +509,7 @@ class StubLinkStubManager : public StubManager
 #ifndef DACCESS_COMPILE
     virtual BOOL TraceManager(Thread *thread,
                               TraceDestination *trace,
-                              CONTEXT *pContext,
+                              T_CONTEXT *pContext,
                               BYTE **pRetAddr);
 #endif
 
@@ -646,7 +646,7 @@ class RangeSectionStubManager : public StubManager
 #ifndef DACCESS_COMPILE
     virtual BOOL TraceManager(Thread *thread,
                               TraceDestination *trace,
-                              CONTEXT *pContext,
+                              T_CONTEXT *pContext,
                               BYTE **pRetAddr);
 #endif
 
@@ -708,7 +708,7 @@ class ILStubManager : public StubManager
 
     virtual BOOL TraceManager(Thread *thread,
                               TraceDestination *trace,
-                              CONTEXT *pContext,
+                              T_CONTEXT *pContext,
                               BYTE **pRetAddr);
 #endif
 
@@ -752,7 +752,7 @@ class InteropDispatchStubManager : public StubManager
 #ifndef DACCESS_COMPILE
     virtual BOOL TraceManager(Thread *thread,
                               TraceDestination *trace,
-                              CONTEXT *pContext,
+                              T_CONTEXT *pContext,
                               BYTE **pRetAddr);
 #endif
 
@@ -797,7 +797,7 @@ class DelegateInvokeStubManager : public StubManager
     virtual BOOL CheckIsStub_Internal(PCODE stubStartAddress);
 
 #if !defined(DACCESS_COMPILE)
-    virtual BOOL TraceManager(Thread *thread, TraceDestination *trace, CONTEXT *pContext, BYTE **pRetAddr);
+    virtual BOOL TraceManager(Thread *thread, TraceDestination *trace, T_CONTEXT *pContext, BYTE **pRetAddr);
     static BOOL TraceDelegateObject(BYTE *orDel, TraceDestination *trace);
 #endif // DACCESS_COMPILE
 
@@ -846,7 +846,7 @@ public:
     TailCallStubManager() : StubManager() {WRAPPER_NO_CONTRACT;}
     ~TailCallStubManager() {WRAPPER_NO_CONTRACT;}
 
-    virtual BOOL TraceManager(Thread * pThread, TraceDestination * pTrace, CONTEXT * pContext, BYTE ** ppRetAddr);
+    virtual BOOL TraceManager(Thread * pThread, TraceDestination * pTrace, T_CONTEXT * pContext, BYTE ** ppRetAddr);
 
     static bool IsTailCallStubHelper(PCODE code);
 #endif // DACCESS_COMPILE

diff --git a/src/vm/threads.h b/src/vm/threads.h
index 144e17c591ac606cc62492aa161344f40f6dc84b..9754478f0c740d1dca9f078995d569ff53044a0c 100644 (file)
--- a/src/vm/threads.h
+++ b/src/vm/threads.h
@@ -3386,7 +3386,7 @@ public:
         m_singleStepper.Disable();
     }
 
-    void ApplySingleStep(CONTEXT *pCtx)
+    void ApplySingleStep(T_CONTEXT *pCtx)
     {
         m_singleStepper.Apply(pCtx);
     }
@@ -3399,7 +3399,7 @@ public:
     // Fixup code called by our vectored exception handler to complete the emulation of single stepping
     // initiated by EnableSingleStep above. Returns true if the exception was indeed encountered during
     // stepping.
-    bool HandleSingleStep(CONTEXT *pCtx, DWORD dwExceptionCode)
+    bool HandleSingleStep(T_CONTEXT *pCtx, DWORD dwExceptionCode)
     {
         return m_singleStepper.Fixup(pCtx, dwExceptionCode);
     }