Merge pull request swiftlang#35389 from DougGregor/irgen-non-fatal-legacy-layouts-fail

DougGregor · web-flow · commit 3c6cf85bd48b · 2021-01-13T22:39:47.000-08:00
[IRGen] Report error in reading legacy layouts non-fatally.
diff --git a/lib/IRGen/GenType.cpp b/lib/IRGen/GenType.cpp
@@ -1420,8 +1420,9 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
   }
 
   bool error = readLegacyTypeInfo(*fs, path);
-  if (error)
-    llvm::report_fatal_error("Cannot read '" + path + "'");
+  if (error) {
+    IGM.error(SourceLoc(), "Cannot read legacy layout file at '" + path + "'");
+  }
 }
 
 TypeConverter::~TypeConverter() {

Original file line number	Diff line number	Diff line change
`@@ -1420,8 +1420,9 @@ TypeConverter::TypeConverter(IRGenModule &IGM)`
`1420`	`1420`	`}`
`1421`	`1421`
`1422`	`1422`	`bool error = readLegacyTypeInfo(*fs, path);`
`1423`		`- if (error)`
`1424`		`- llvm::report_fatal_error("Cannot read '" + path + "'");`
	`1423`	`+ if (error) {`
	`1424`	`+ IGM.error(SourceLoc(), "Cannot read legacy layout file at '" + path + "'");`
	`1425`	`+ }`
`1425`	`1426`	`}`
`1426`	`1427`
`1427`	`1428`	`TypeConverter::~TypeConverter() {`