llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Nathan Ridge (HighCommander4) <details> <summary>Changes</summary> Backport https://github.com/llvm/llvm-project/commit/289baf1f42c8b5773271b611cd235d4ab94bb4e8 Fixes https://github.com/llvm/llvm-project/issues/135922 --- Full diff: https://github.com/llvm/llvm-project/pull/135927.diff 2 Files Affected: - (modified) clang/lib/AST/Expr.cpp (+5-2) - (modified) clang/test/SemaCXX/cxx2b-deducing-this.cpp (+7) ``````````diff diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index 8571b617c70eb..a5b7ef8c4271b 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -1665,8 +1665,11 @@ SourceLocation CallExpr::getBeginLoc() const { Method && Method->isExplicitObjectMemberFunction()) { bool HasFirstArg = getNumArgs() > 0 && getArg(0); assert(HasFirstArg); - if (HasFirstArg) - return getArg(0)->getBeginLoc(); + if (HasFirstArg) { + if (auto FirstArgLoc = getArg(0)->getBeginLoc(); FirstArgLoc.isValid()) { + return FirstArgLoc; + } + } } } diff --git a/clang/test/SemaCXX/cxx2b-deducing-this.cpp b/clang/test/SemaCXX/cxx2b-deducing-this.cpp index 6f17ce7275456..7e392213710a4 100644 --- a/clang/test/SemaCXX/cxx2b-deducing-this.cpp +++ b/clang/test/SemaCXX/cxx2b-deducing-this.cpp @@ -1134,3 +1134,10 @@ struct S { static_assert((S{} << 11) == a); // expected-error@-1 {{use of undeclared identifier 'a'}} } + +namespace GH135522 { +struct S { + auto f(this auto) -> S; + bool g() { return f(); } // expected-error {{no viable conversion from returned value of type 'S' to function return type 'bool'}} +}; +} `````````` </details> https://github.com/llvm/llvm-project/pull/135927 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
