Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

include/swift/Reflection/ReflectionContext.h

@@ -288,7 +288,7 @@ class ReflectionContext
   }
 
 #elif defined(_WIN32)
-  bool addImage(RemoteAddress ImageStart) {
+  bool readPECOFFSections(RemoteAddress ImageStart) {
     auto DOSHdrBuf = this->getReader().readBytes(
         ImageStart, sizeof(llvm::object::dos_header));
     auto DOSHdr =
@@ -380,6 +380,29 @@ class ReflectionContext
     return true;
   }
 
+  bool addImage(RemoteAddress ImageStart) {
+    auto Buf = this->getReader().readBytes(ImageStart,
+                                           sizeof(llvm::object::dos_header));
+    if (!Buf)
+      return false;
+
+    auto DOSHdr = reinterpret_cast<const llvm::object::dos_header *>(Buf.get());
+    if (!(DOSHdr->Magic[0] == 'M' && DOSHdr->Magic[1] == 'Z'))
+      return false;
+
+    auto PEHeaderAddress =
+        ImageStart.getAddressData() + DOSHdr->AddressOfNewExeHeader;
+
+    Buf = this->getReader().readBytes(RemoteAddress(PEHeaderAddress),
+                                      sizeof(llvm::COFF::PEMagic));
+    if (!Buf)
+      return false;
+
+    if (memcmp(Buf.get(), llvm::COFF::PEMagic, sizeof(llvm::COFF::PEMagic)))
+      return false;
+
+    return readPECOFFSections(ImageStart);
+  }
 #else // ELF platforms.
   template <typename T> bool readELFSections(RemoteAddress ImageStart) {
     auto Buf =

lib/Basic/Default/TaskQueue.inc

@@ -143,12 +143,22 @@ bool TaskQueue::execute(TaskBeganCallback Began, TaskFinishedCallback Finished,
       stderrContents = stderrBuffer.get()->getBuffer();
     }
 
-    if (ReturnCode == -2) {
+#if defined(_WIN32)
+    // Wait() sets the upper two bits of the return code to indicate warnings
+    // (10) and errors (11).
+    //
+    // This isn't a true signal on Windows, but we'll treat it as such so that
+    // we clean up after it properly
+    bool crashed = ReturnCode & 0xC0000000;
+#else
       // Wait() returning a return code of -2 indicates the process received
       // a signal during execution.
+    bool crashed = ReturnCode == -2;
+#endif
+    if (crashed) {
       if (Signalled) {
         TaskFinishedResponse Response =
-            Signalled(PI.Pid, ErrMsg, stdoutContents, stderrContents, T->Context, None, TaskProcessInformation(PI.Pid));
+            Signalled(PI.Pid, ErrMsg, stdoutContents, stderrContents, T->Context, ReturnCode, TaskProcessInformation(PI.Pid));
         ContinueExecution = Response != TaskFinishedResponse::StopExecution;
       } else {
         // If we don't have a Signalled callback, unconditionally stop.

test/Driver/assert.swift

@@ -1,5 +1,3 @@
-// Windows programs cannot fail due to a signal
-// UNSUPPORTED: windows
 // RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-immediately 2>&1 | %FileCheck %s
 // RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-assert-after-parse 2>&1 | %FileCheck %s
 

test/Driver/crash.swift

@@ -1,5 +1,3 @@
-// Windows programs cannot fail due to a signal
-// UNSUPPORTED: windows
 // RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-immediately 2>&1 | %FileCheck %s
 
 // RUN: not %swiftc_driver -emit-executable -o %t.exe %s -Xfrontend -debug-crash-after-parse 2>&1 | %FileCheck %s