[x86/Linux] Revise COMPlusThrowCallback (dotnet#8430)

GetCallerToken and GetImpersonationToken methods in FrameSecurityDescriptorBaseObject are implemented only for Windows-platform.
picenka21 · Dec 6, 2016 · 910209a · 910209a
1 parent 6c1b9cc
commit 910209a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/vm/excep.h b/src/vm/excep.h
@@ -88,9 +88,11 @@ struct ThrowCallbackType
     MethodDesc * pProfilerNotify;   // Context for profiler callbacks -- see COMPlusFrameHandler().
     BOOL    bReplaceStack;  // Used to pass info to SaveStackTrace call
     BOOL    bSkipLastElement;// Used to pass info to SaveStackTrace call
+#ifndef FEATURE_PAL
     HANDLE hCallerToken;
     HANDLE hImpersonationToken;
     BOOL bImpersonationTokenSet;
+#endif // !FEATURE_PAL
 #ifdef _DEBUG
     void * pCurrentExceptionRecord;
     void * pPrevExceptionRecord;
@@ -114,9 +116,11 @@ struct ThrowCallbackType
         pProfilerNotify = NULL;
         bReplaceStack = FALSE;
         bSkipLastElement = FALSE;
+#ifndef FEATURE_PAL
         hCallerToken = NULL;
         hImpersonationToken = NULL;
         bImpersonationTokenSet = FALSE;
+#endif // !FEATURE_PAL
 
 #ifdef _DEBUG
         pCurrentExceptionRecord = 0;

diff --git a/src/vm/i386/excepx86.cpp b/src/vm/i386/excepx86.cpp
@@ -2424,6 +2424,7 @@ StackWalkAction COMPlusThrowCallback(       // SWA value
         pData->bSkipLastElement = FALSE;
     }
 
+#ifndef FEATURE_PAL
     // Check for any impersonation on the frame and save that for use during EH filter callbacks
     OBJECTREF* pRefSecDesc = pCf->GetAddrOfSecurityObject();
     if (pRefSecDesc != NULL && *pRefSecDesc != NULL)
@@ -2442,6 +2443,7 @@ StackWalkAction COMPlusThrowCallback(       // SWA value
             }
         }
     }
+#endif // !FEATURE_PAL
 
     // now we've got the stack trace, if we aren't allowed to catch this and we're first pass, return
     if (pData->bDontCatch)

diff --git a/src/vm/object.h b/src/vm/object.h
@@ -2880,8 +2880,10 @@ class FrameSecurityDescriptorBaseObject : public Object
         LIMITED_METHOD_CONTRACT;
         m_declSecComputed = !!declSec;
     }
+#ifndef FEATURE_PAL
     LPVOID GetCallerToken();
     LPVOID GetImpersonationToken();
+#endif  // FEATURE_PAL
 };
 
 #ifdef FEATURE_COMPRESSEDSTACK