Tolerate non-empty braces in braces

David Ungar · David Ungar · commit 5d5776b64de7 · 2020-04-10T18:15:12.000-07:00
diff --git a/lib/AST/ASTScopeCreation.cpp b/lib/AST/ASTScopeCreation.cpp
@@ -658,9 +658,10 @@ class ScopeCreator final {
     ASTScopeAssert(!n.isDecl(DeclKind::Accessor),
                    "Should not see accessors here");
     // Can occur in illegal code
+    // non-empty brace stmt could define a new insertion point
     if (auto *const s = n.dyn_cast<Stmt *>()) {
       if (auto *const bs = dyn_cast<BraceStmt>(s))
-        ASTScopeAssert(bs->empty(), "Might mess up insertion point");
+        return !bs->empty();
     }
     return !n.isDecl(DeclKind::Var);
   }

Original file line number	Diff line number	Diff line change
`@@ -658,9 +658,10 @@ class ScopeCreator final {`
`658`	`658`	`ASTScopeAssert(!n.isDecl(DeclKind::Accessor),`
`659`	`659`	`"Should not see accessors here");`
`660`	`660`	`// Can occur in illegal code`
	`661`	`+ // non-empty brace stmt could define a new insertion point`
`661`	`662`	`if (auto const s = n.dyn_cast<Stmt >()) {`
`662`	`663`	`if (auto *const bs = dyn_cast<BraceStmt>(s))`
`663`		`- ASTScopeAssert(bs->empty(), "Might mess up insertion point");`
	`664`	`+ return !bs->empty();`
`664`	`665`	`}`
`665`	`666`	`return !n.isDecl(DeclKind::Var);`
`666`	`667`	`}`