[Clang] fixed clang frontend crash with friend class declaration and overload == #133878
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Ankur Ahir (Ankur-0429) ChangesFixes #132249 Full diff: https://github.com/llvm/llvm-project/pull/133878.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 43bf9b7cd0f95..36015a93c9728 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -9037,8 +9037,9 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
return true;
if (llvm::none_of(RD->friends(), [&](const FriendDecl *F) {
- return FD->getCanonicalDecl() ==
- F->getFriendDecl()->getCanonicalDecl();
+ return F->getFriendDecl() &&
+ FD->getCanonicalDecl() ==
+ F->getFriendDecl()->getCanonicalDecl();
})) {
Diag(FD->getLocation(), diag::err_defaulted_comparison_not_friend)
<< int(DCK) << int(0) << RD;
diff --git a/clang/test/CXX/class/class.compare/class.compare.default/p1.cpp b/clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
index a195e0548152d..37bf98be889d5 100644
--- a/clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
+++ b/clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
@@ -285,3 +285,14 @@ struct j {
};
bool j::operator==(const j &) const = default;
}
+
+namespace evil2 {
+ struct k {};
+
+ struct l {
+ friend bool operator==(const l& a, const l& b);
+ friend class k;
+ };
+
+ bool operator==(const l& a, const l& b) = default;
+}
|
|
And I think this should follow the same approach in #132320 |
Ankur-0429
force-pushed
the
ankurahir/clang-frontend-crash
branch
from
b0aa6fd to
b0e5fcb
Compare
Ankur-0429
requested review from
daniel-grumberg,
QuietMisdreavus,
rupprecht,
keith,
aaronmondal,
aaupov,
maksfb,
rafaelauler,
ayermolo,
dcci,
yota9,
ftynse,
makslevental,
stellaraccident,
antiagainst,
kuhar,
nicolasvasilache,
dcaballe,
rengolin,
JDevlieghere,
lanza,
bcardosolopes and
Endilll
as code owners
cor3ntin
removed request for
makslevental,
dcci,
bcardosolopes,
maksfb,
rafaelauler,
nicolasvasilache,
lanza,
Endilll,
daniel-grumberg,
yota9,
dcaballe,
aaronmondal and
ayermolo
clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
Outdated
Show resolved
Hide resolved
|
Thanks! This makes sense to me, but I'm adding a couple more reviewers. |
|
Congratulations on your first PR. Let me know if/when you want me to merge that for you. Cheers |
|
@cor3ntin feel free to merge the PR when it's ready. Happy to help! |
zyn0217
changed the title
|
@Ankur-0429 Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/15365 Here is the relevant piece of the build log for the reference |
Fixes #132249