Merge pull request #80198 from DougGregor/current-context-isolation-crash

DougGregor · web-flow · commit a84db8f87dbb · 2025-03-22T17:33:33.000-07:00
Avoid crashing if a MacroExpansionExpr failed to produce an expression
diff --git a/lib/Sema/TypeCheckConcurrency.cpp b/lib/Sema/TypeCheckConcurrency.cpp
@@ -4105,7 +4105,8 @@ namespace {
       }
 
       if (auto *macro = dyn_cast<MacroExpansionExpr>(expr)) {
-        expr = macro->getRewritten();
+        if (auto rewritten = macro->getRewritten())
+          expr = rewritten;
       }
 
       if (auto *isolation = dyn_cast<CurrentContextIsolationExpr>(expr)) {

Original file line number	Diff line number	Diff line change
`@@ -4105,7 +4105,8 @@ namespace {`
`4105`	`4105`	`}`
`4106`	`4106`
`4107`	`4107`	`if (auto *macro = dyn_cast<MacroExpansionExpr>(expr)) {`
`4108`		`- expr = macro->getRewritten();`
	`4108`	`+ if (auto rewritten = macro->getRewritten())`
	`4109`	`+ expr = rewritten;`
`4109`	`4110`	`}`
`4110`	`4111`
`4111`	`4112`	`if (auto *isolation = dyn_cast<CurrentContextIsolationExpr>(expr)) {`