Merge pull request #17382 from weshaggard/MergeMaster21

[release/2.1] Merge master into release/2.1

Author: weshaggard

BuildToolsVersion.txt

@@ -1 +1 @@
-2.1.0-preview3-02629-02
+2.1.0-preview3-02631-01

ILAsmVersion.txt

@@ -1 +1 @@
-2.1.0-preview3-26329-01
+2.1.0-preview3-26331-05

dependencies.props

@@ -23,18 +23,18 @@
 
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>fc1fbe0b638a97baf2aa3bf403a7db7dbfc0b8b5</CoreFxCurrentRef>
-    <CoreClrCurrentRef>fc1fbe0b638a97baf2aa3bf403a7db7dbfc0b8b5</CoreClrCurrentRef>
-    <BuildToolsCurrentRef>0e6f6fa6b335fa1e0c26c6f24031003cb2d48b81</BuildToolsCurrentRef>
-    <PgoDataCurrentRef>11d07e3818c16b6b43be0fc3379b9719dc0cf8b9</PgoDataCurrentRef>
+    <CoreFxCurrentRef>2d7ffd7ca4f02a3096328ef07797070b7490e46b</CoreFxCurrentRef>
+    <CoreClrCurrentRef>2d7ffd7ca4f02a3096328ef07797070b7490e46b</CoreClrCurrentRef>
+    <BuildToolsCurrentRef>3ea5068d11ab2844483e26cd71bf3c50216f9fe5</BuildToolsCurrentRef>
+    <PgoDataCurrentRef>553f30357d08df4ed6d32f70f3478a76f5db79c2</PgoDataCurrentRef>
   </PropertyGroup>
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview3-26329-05</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview3-26329-05</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview3-26331-05</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview3-26331-05</MicrosoftNETCorePlatformsPackageVersion>
     <PgoDataPackageVersion>99.99.99-master-20180228-0037</PgoDataPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview3-26329-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview3-26331-05</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
     <XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
@@ -51,7 +51,7 @@
   <!-- Package versions used as toolsets -->
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
-    <FeedTasksPackageVersion>2.1.0-preview3-02629-02</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>2.1.0-preview3-02631-01</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <!-- Package dependency verification/auto-upgrade configuration. -->

src/debug/di/process.cpp

@@ -11582,54 +11582,6 @@ void CordbProcess::HandleSyncCompleteRecieved()
 
 #ifdef FEATURE_INTEROP_DEBUGGING
 
-// Get a Thread's _user_ starting address (the real starting address may be some
-// OS shim.)
-// This may return NULL for the Async-Break thread.
-void* GetThreadUserStartAddr(const DEBUG_EVENT* pCreateThreadEvent)
-{
-    // On Win7 and above, we can trust the lpStartAddress field of the CREATE_THREAD_DEBUG_EVENT
-    // to be the user start address (the actual OS start address is an implementation detail that 
-    // doesn't need to be exposed to users). Note that we are assuming that the target process
-    // is running on Win7 if mscordbi is. If we ever have some remoting scenario where the target
-    // can run on a different windows machine with a different OS version we will need a way to
-    // determine the target's OS version
-    if(RunningOnWin7())
-    {
-        return pCreateThreadEvent->u.CreateThread.lpStartAddress;
-    }
-    
-    // On pre-Win7 OSes, we rely on an OS implementation detail to get the real user thread start:
-    // it exists in EAX at thread start time.
-    // Note that for a brief period of time there was a GetThreadStartInformation API in Longhorn 
-    // we could use for this, but it was removed during the Longhorn reset.  
-    HANDLE hThread = pCreateThreadEvent->u.CreateThread.hThread;
-#if defined(DBG_TARGET_X86)
-    // Grab the thread's context.
-    DT_CONTEXT c;
-    c.ContextFlags = DT_CONTEXT_FULL;
-    BOOL succ = DbiGetThreadContext(hThread, &c);
-
-    if (succ)
-    {
-        return (void*) c.Eax;
-    }
-#elif defined(DBG_TARGET_AMD64)
-    DT_CONTEXT c;
-    c.ContextFlags = DT_CONTEXT_FULL;
-    BOOL succ = DbiGetThreadContext(hThread, &c);
-
-    if (succ)
-    {
-        return (void*) c.Rcx;
-    }
-#else
-    PORTABILITY_ASSERT("port GetThreadUserStartAddr");
-#endif
-
-    return NULL;
-}
-
-
 //---------------------------------------------------------------------------------------
 //
 // Get (create if needed) the unmanaged thread for an unmanaged debug event.
@@ -11706,7 +11658,7 @@ CordbUnmanagedThread * CordbProcess::GetUnmanagedThreadFromEvent(const DEBUG_EVE
                 UpdateRightSideDCB();
                 if ((this->GetDCB()->m_helperThreadStartAddr != NULL) && (pUnmanagedThread != NULL))
                 {
-                    void * pStartAddr = GetThreadUserStartAddr(pEvent);
+                    void * pStartAddr = pEvent->u.CreateThread.lpStartAddress;
 
                     if (pStartAddr == this->GetDCB()->m_helperThreadStartAddr)
                     {

src/debug/ee/debugger.cpp

@@ -13525,8 +13525,7 @@ void Debugger::UnhandledHijackWorker(CONTEXT * pContext, EXCEPTION_RECORD * pRec
     // On Win7 WatsonLastChance returns CONTINUE_SEARCH for unhandled exceptions execpt stack overflow, and
     // lets OS launch debuggers for us.  Before the unhandled exception reaches the OS, CLR UEF has already 
     // processed this unhandled exception.  Thus, we should not call into CLR UEF again if it is the case.
-    if (RunningOnWin7() &&
-        pThread && 
+    if (pThread && 
         (pThread->HasThreadStateNC(Thread::TSNC_ProcessedUnhandledException) || 
          pThread->HasThreadStateNC(Thread::TSNC_AppDomainContainUnhandled) ||
          fSOException))

src/gc/env/gcenv.object.h

@@ -36,11 +36,12 @@ class ObjHeader
 
 static_assert(sizeof(ObjHeader) == sizeof(uintptr_t), "this assumption is made by the VM!");
 
-#define MTFlag_ContainsPointers 0x0100
-#define MTFlag_HasFinalizer     0x0010
-#define MTFlag_IsArray          0x0008
-#define MTFlag_Collectible      0x1000
-#define MTFlag_HasComponentSize 0x8000
+#define MTFlag_ContainsPointers     0x0100
+#define MTFlag_HasCriticalFinalizer 0x0800
+#define MTFlag_HasFinalizer         0x0010
+#define MTFlag_IsArray              0x0008
+#define MTFlag_Collectible          0x1000
+#define MTFlag_HasComponentSize     0x8000
 
 class MethodTable
 {
@@ -103,7 +104,7 @@ class MethodTable
 
     bool HasCriticalFinalizer()
     {
-        return false;
+        return (m_flags & MTFlag_HasCriticalFinalizer) != 0;
     }
 
     bool IsArray()