Sema: Fix crash in diagnoseIfSynthesisUnsupportedForDecl() with tuple extension

slavapestov · slavapestov · commit eec924b5052c · 2025-06-17T09:52:03.000-04:00
diff --git a/lib/Sema/DerivedConformance/DerivedConformance.cpp b/lib/Sema/DerivedConformance/DerivedConformance.cpp
@@ -272,6 +272,9 @@ void DerivedConformance::diagnoseIfSynthesisUnsupportedForDecl(
     shouldDiagnose = !isa<EnumDecl>(nominal);
   }
 
+  if (isa<BuiltinTupleDecl>(nominal))
+    shouldDiagnose = false;
+
   if (shouldDiagnose) {
     auto &ctx = nominal->getASTContext();
     ctx.Diags.diagnose(nominal->getLoc(),
diff --git a/test/Generics/tuple-conformances-synthesize-crash.swift b/test/Generics/tuple-conformances-synthesize-crash.swift
@@ -0,0 +1,5 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+// Just don't crash.
+extension () : Comparable {}
+
diff --git a/validation-test/compiler_crashers_2_fixed/259dac55924ef426.swift b/validation-test/compiler_crashers_2_fixed/259dac55924ef426.swift
@@ -1,3 +1,3 @@
 // {"signature":"swift::GenericContext::getGenericParams() const"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 typealias a = () extension a : Comparable

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,9 @@ void DerivedConformance::diagnoseIfSynthesisUnsupportedForDecl(`
`272`	`272`	`shouldDiagnose = !isa<EnumDecl>(nominal);`
`273`	`273`	`}`
`274`	`274`
	`275`	`+ if (isa<BuiltinTupleDecl>(nominal))`
	`276`	`+ shouldDiagnose = false;`
	`277`	`+`
`275`	`278`	`if (shouldDiagnose) {`
`276`	`279`	`auto &ctx = nominal->getASTContext();`
`277`	`280`	`ctx.Diags.diagnose(nominal->getLoc(),`