Do not abort on double-registration of SIL class. Instead do nothing.

artemcm · artemcm · commit 96d09d2f617e · 2024-03-06T14:33:59.000-08:00
diff --git a/lib/SIL/Utils/SILBridging.cpp b/lib/SIL/Utils/SILBridging.cpp
@@ -110,8 +110,8 @@ void registerBridgedClass(BridgedStringRef bridgedClassName, SwiftMetatype metat
   SILNodeKind kind = iter->second;
   SwiftMetatype existingTy = nodeMetatypes[(unsigned)kind];
   if (existingTy) {
-    llvm::errs() << "Double registration of class " << className << '\n';
-    abort();
+    // We have already registered this class
+    return;
   }
   nodeMetatypes[(unsigned)kind] = metatype;
 }

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,8 @@ void registerBridgedClass(BridgedStringRef bridgedClassName, SwiftMetatype metat`
`110`	`110`	`SILNodeKind kind = iter->second;`
`111`	`111`	`SwiftMetatype existingTy = nodeMetatypes[(unsigned)kind];`
`112`	`112`	`if (existingTy) {`
`113`		`- llvm::errs() << "Double registration of class " << className << '\n';`
`114`		`- abort();`
	`113`	`+ // We have already registered this class`
	`114`	`+ return;`
`115`	`115`	`}`
`116`	`116`	`nodeMetatypes[(unsigned)kind] = metatype;`
`117`	`117`	`}`