Skip to content

Commit

Permalink
Revert "[clang] Fix crash when declaring invalid lambda member" (#84615)
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalybuka committed Mar 9, 2024
1 parent ba13fa2 commit def038b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
5 changes: 1 addition & 4 deletions clang/docs/ReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,6 @@ Bug Fixes in This Version
operator.
Fixes (#GH83267).

- Fixes an assertion failure on invalid code when trying to define member
functions in lambdas.

Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -411,7 +408,7 @@ RISC-V Support
CUDA/HIP Language Changes
^^^^^^^^^^^^^^^^^^^^^^^^^

- PTX is no longer included by default when compiling for CUDA. Using
- PTX is no longer included by default when compiling for CUDA. Using
``--cuda-include-ptx=all`` will return the old behavior.

CUDA Support
Expand Down
7 changes: 4 additions & 3 deletions clang/lib/AST/DeclCXX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1567,9 +1567,10 @@ bool CXXRecordDecl::isGenericLambda() const {

#ifndef NDEBUG
static bool allLookupResultsAreTheSame(const DeclContext::lookup_result &R) {
return llvm::all_of(R, [&](NamedDecl *D) {
return D->isInvalidDecl() || declaresSameEntity(D, R.front());
});
for (auto *D : R)
if (!declaresSameEntity(D, R.front()))
return false;
return true;
}
#endif

Expand Down
18 changes: 8 additions & 10 deletions clang/test/SemaCXX/lambda-expressions.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// RUN: %clang_cc1 -std=c++11 -Wno-unused-value -fsyntax-only -verify=expected,expected-cxx14,cxx11 -fblocks %s
// RUN: %clang_cc1 -std=c++14 -Wno-unused-value -fsyntax-only -verify -verify=expected-cxx14 -fblocks %s
// RUN: %clang_cc1 -std=c++17 -Wno-unused-value -verify -ast-dump -fblocks %s | FileCheck %s

Expand Down Expand Up @@ -559,8 +558,8 @@ struct B {
int x;
A a = [&] { int y = x; };
A b = [&] { [&] { [&] { int y = x; }; }; };
A d = [&](auto param) { int y = x; }; // cxx11-error {{'auto' not allowed in lambda parameter}}
A e = [&](auto param) { [&] { [&](auto param2) { int y = x; }; }; }; // cxx11-error 2 {{'auto' not allowed in lambda parameter}}
A d = [&](auto param) { int y = x; };
A e = [&](auto param) { [&] { [&](auto param2) { int y = x; }; }; };
};

B<int> b;
Expand Down Expand Up @@ -590,7 +589,6 @@ struct S1 {
void foo1() {
auto s0 = S1{[name=]() {}}; // expected-error 2 {{expected expression}}
auto s1 = S1{[name=name]() {}}; // expected-error {{use of undeclared identifier 'name'; did you mean 'name1'?}}
// cxx11-warning@-1 {{initialized lambda captures are a C++14 extension}}
}
}

Expand All @@ -606,7 +604,7 @@ namespace PR25627_dont_odr_use_local_consts {

namespace ConversionOperatorDoesNotHaveDeducedReturnType {
auto x = [](int){};
auto y = [](auto &v) -> void { v.n = 0; }; // cxx11-error {{'auto' not allowed in lambda parameter}} cxx11-note {{candidate function not viable}} cxx11-note {{conversion candidate}}
auto y = [](auto &v) -> void { v.n = 0; };
using T = decltype(x);
using U = decltype(y);
using ExpectedTypeT = void (*)(int);
Expand All @@ -626,22 +624,22 @@ namespace ConversionOperatorDoesNotHaveDeducedReturnType {
template<typename T>
friend constexpr U::operator ExpectedTypeU<T>() const noexcept;
#else
friend auto T::operator()(int) const; // cxx11-error {{'auto' return without trailing return type; deduced return types are a C++14 extension}}
friend auto T::operator()(int) const;
friend T::operator ExpectedTypeT() const;

template<typename T>
friend void U::operator()(T&) const; // cxx11-error {{friend declaration of 'operator()' does not match any declaration}}
friend void U::operator()(T&) const;
// FIXME: This should not match, as above.
template<typename T>
friend U::operator ExpectedTypeU<T>() const; // cxx11-error {{friend declaration of 'operator void (*)(type-parameter-0-0 &)' does not match any declaration}}
friend U::operator ExpectedTypeU<T>() const;
#endif

private:
int n;
};

// Should be OK in C++14 and later: lambda's call operator is a friend.
void use(X &x) { y(x); } // cxx11-error {{no matching function for call to object}}
// Should be OK: lambda's call operator is a friend.
void use(X &x) { y(x); }

// This used to crash in return type deduction for the conversion opreator.
struct A { int n; void f() { +[](decltype(n)) {}; } };
Expand Down

0 comments on commit def038b

Please sign in to comment.