Sema: Handle bogus DeclNameRefs in translateExprToDeclRefTypeRepr()

slavapestov · slavapestov · commit 4e6352d5d999 · 2025-05-30T16:27:01.000-04:00
diff --git a/lib/Sema/TypeCheckPattern.cpp b/lib/Sema/TypeCheckPattern.cpp
@@ -221,6 +221,11 @@ static DeclRefTypeRepr *translateExprToDeclRefTypeRepr(Expr *E, ASTContext &C) {
     }
 
     DeclRefTypeRepr *visitUnresolvedDeclRefExpr(UnresolvedDeclRefExpr *udre) {
+      if (!udre->getName().isSimpleName() ||
+          udre->getName().isOperator() ||
+          udre->getName().isSpecial())
+        return nullptr;
+
       return UnqualifiedIdentTypeRepr::create(C, udre->getNameLoc(),
                                               udre->getName());
     }
diff --git a/validation-test/compiler_crashers_2_fixed/448bdb8b9df6dd2.swift b/validation-test/compiler_crashers_2_fixed/448bdb8b9df6dd2.swift
@@ -1,3 +1,3 @@
 // {"signature":"swift::DeclRefTypeRepr::overwriteNameRef(swift::DeclNameRef)"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 switch {                         case    init(

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,11 @@ static DeclRefTypeRepr translateExprToDeclRefTypeRepr(Expr E, ASTContext &C) {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`DeclRefTypeRepr visitUnresolvedDeclRefExpr(UnresolvedDeclRefExpr udre) {`
	`224`	`+ if (!udre->getName().isSimpleName() \|\|`
	`225`	`+ udre->getName().isOperator() \|\|`
	`226`	`+ udre->getName().isSpecial())`
	`227`	`+ return nullptr;`
	`228`	`+`
`224`	`229`	`return UnqualifiedIdentTypeRepr::create(C, udre->getNameLoc(),`
`225`	`230`	`udre->getName());`
`226`	`231`	`}`