[Sema][ObjC] Invalidate BlockDecl with invalid ParmVarDecl

danix800 · danix800 · commit 3cb16f6d2ddd · 2023-07-24T18:32:46.000+08:00
BlockDecl should be invalidated because of its invalid ParmVarDecl. Fixes #1 of #64005 Differential Revision: https://reviews.llvm.org/D155984
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
@@ -674,6 +674,8 @@ Bug Fixes in This Version
   value exprs is invalid. Propagating the error info up by replacing BlockExpr
   with a RecoveryExpr. This fixes:
   (`#63863 <https://github.com/llvm/llvm-project/issues/63863>_`)
+- Invalidate BlockDecl with invalid ParmVarDecl
+  (`#64005 <https://github.com/llvm/llvm-project/issues/64005>_`)
 
 Bug Fixes to Compiler Builtins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
@@ -16959,6 +16959,9 @@ void Sema::ActOnBlockArguments(SourceLocation CaretLoc, Declarator &ParamInfo,
 
       PushOnScopeChains(AI, CurBlock->TheScope);
     }
+
+    if (AI->isInvalidDecl())
+      CurBlock->TheDecl->setInvalidDecl();
   }
 }
 
diff --git a/clang/test/AST/ast-dump-recovery.m b/clang/test/AST/ast-dump-recovery.m
@@ -24,3 +24,9 @@ void k(Foo *foo) {
 int (^gh63863)() = ^() {
   return undef;
 };
+
+// CHECK:      `-BlockExpr {{.*}} 'int (^)(int, int)'
+// CHECK-NEXT:   `-BlockDecl {{.*}} invalid
+int (^gh64005)(int, int) = ^(int, undefined b) {
+   return 1;
+};

Original file line number	Diff line number	Diff line change
`@@ -16959,6 +16959,9 @@ void Sema::ActOnBlockArguments(SourceLocation CaretLoc, Declarator &ParamInfo,`
`16959`	`16959`
`16960`	`16960`	`PushOnScopeChains(AI, CurBlock->TheScope);`
`16961`	`16961`	`}`
	`16962`	`+`
	`16963`	`+ if (AI->isInvalidDecl())`
	`16964`	`+ CurBlock->TheDecl->setInvalidDecl();`
`16962`	`16965`	`}`
`16963`	`16966`	`}`
`16964`	`16967`