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

swift-ci · swift-ci · commit ff7d2c2503d0 · 2019-08-26T13:04:27.000-07:00
diff --git a/lib/IRGen/IRGen.cpp b/lib/IRGen/IRGen.cpp
@@ -594,7 +594,7 @@ bool swift::performLLVM(IRGenOptions &Opts, DiagnosticEngine *Diags,
     if (DiagMutex)
       DiagMutex->unlock();
   }
-
+#if 0
 #ifndef NDEBUG
   if (!OriginalOutputFilename.empty()) {
     // We're done changing the file; make sure it's saved before we compare.
@@ -630,6 +630,7 @@ bool swift::performLLVM(IRGenOptions &Opts, DiagnosticEngine *Diags,
       llvm_unreachable("one of these should be a temporary file");
     }
   }
+#endif
 #endif
 
   return false;

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ bool swift::performLLVM(IRGenOptions &Opts, DiagnosticEngine *Diags,`
`594`	`594`	`if (DiagMutex)`
`595`	`595`	`DiagMutex->unlock();`
`596`	`596`	`}`
`597`		`-`
	`597`	`+#if 0`
`598`	`598`	`#ifndef NDEBUG`
`599`	`599`	`if (!OriginalOutputFilename.empty()) {`
`600`	`600`	`// We're done changing the file; make sure it's saved before we compare.`
`@@ -630,6 +630,7 @@ bool swift::performLLVM(IRGenOptions &Opts, DiagnosticEngine *Diags,`
`630`	`630`	`llvm_unreachable("one of these should be a temporary file");`
`631`	`631`	`}`
`632`	`632`	`}`
	`633`	`+#endif`
`633`	`634`	`#endif`
`634`	`635`
`635`	`636`	`return false;`