Merge pull request swiftlang#33701 from davidungar/handle-bad-j

David Ungar · web-flow · commit 6f9df0976624 · 2020-08-29T22:26:55.000-07:00
Don't crash on a bad -j input
diff --git a/test/Driver/badJ.swift b/test/Driver/badJ.swift
@@ -0,0 +1,2 @@
+// RUN: not %swiftc_driver %S/../Inputs/empty.swift -jsnort 2>&1 |  %FileCheck %s
+// CHECK-NOT: Stack dump
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
@@ -192,6 +192,8 @@ static int run_driver(StringRef ExecName,
 
   if (C) {
     std::unique_ptr<sys::TaskQueue> TQ = TheDriver.buildTaskQueue(*C);
+    if (!TQ)
+        return 1;
     return C->performJobs(std::move(TQ));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// RUN: not %swiftc_driver %S/../Inputs/empty.swift -jsnort 2>&1 \| %FileCheck %s`
	`2`	`+// CHECK-NOT: Stack dump`
Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,8 @@ static int run_driver(StringRef ExecName,`
`192`	`192`
`193`	`193`	`if (C) {`
`194`	`194`	`std::unique_ptr<sys::TaskQueue> TQ = TheDriver.buildTaskQueue(*C);`
	`195`	`+ if (!TQ)`
	`196`	`+ return 1;`
`195`	`197`	`return C->performJobs(std::move(TQ));`
`196`	`198`	`}`
`197`	`199`