llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) <details> <summary>Changes</summary> Fixes https://github.com/llvm/llvm-project/issues/138824 --- Full diff: https://github.com/llvm/llvm-project/pull/138832.diff 3 Files Affected: - (modified) clang/lib/AST/ByteCode/Compiler.cpp (+4) - (modified) clang/lib/AST/ExprConstant.cpp (+1-1) - (modified) clang/test/SemaCXX/constant-expression-cxx11.cpp (+9) ``````````diff diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp index ae6574cf99159..32ec917effdc7 100644 --- a/clang/lib/AST/ByteCode/Compiler.cpp +++ b/clang/lib/AST/ByteCode/Compiler.cpp @@ -2932,6 +2932,10 @@ bool Compiler<Emitter>::VisitLambdaExpr(const LambdaExpr *E) { // record with their initializers. for (const Record::Field &F : R->fields()) { const Expr *Init = *CaptureInitIt; + + if (Init->containsErrors()) + return false; + ++CaptureInitIt; if (!Init) diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index e5950f461e4b2..500d43accb082 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -11038,7 +11038,7 @@ bool RecordExprEvaluator::VisitLambdaExpr(const LambdaExpr *E) { // If there is no initializer, either this is a VLA or an error has // occurred. - if (!CurFieldInit) + if (!CurFieldInit || CurFieldInit->containsErrors()) return Error(E); LValue Subobject = This; diff --git a/clang/test/SemaCXX/constant-expression-cxx11.cpp b/clang/test/SemaCXX/constant-expression-cxx11.cpp index dc8f4bf1666ee..0a135654fab18 100644 --- a/clang/test/SemaCXX/constant-expression-cxx11.cpp +++ b/clang/test/SemaCXX/constant-expression-cxx11.cpp @@ -2598,3 +2598,12 @@ void foo() { constexpr S s[2] = { }; // expected-error {{constexpr variable 's' must be initialized by a constant expression}} } } + +namespace DoubleCapture { + int DC() { + int a = 1000; + static auto f = + [a, &a] { // expected-error {{'a' can appear only once in a capture list}} + }; + } +} `````````` </details> https://github.com/llvm/llvm-project/pull/138832 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
