Skip to content

Commit d23ef9e

Browse files
[Clang] [Sema] Handle placeholders in '.*' expressions (llvm#83103)
When analysing whether we should handle a binary expression as an overloaded operator call or a builtin operator, we were calling `checkPlaceholderForOverload()`, which takes care of any placeholders that are not overload sets—which would usually make sense since those need to be handled as part of overload resolution. Unfortunately, we were also doing that for `.*`, which is not overloadable, and then proceeding to create a builtin operator anyway, which would crash if the RHS happened to be an unresolved overload set (due hitting an assertion in `CreateBuiltinBinOp()`—specifically, in one of its callees—in the `.*` case that makes sure its arguments aren’t placeholders). This pr instead makes it so we check for *all* placeholders early if the operator is `.*`. It’s worth noting that, 1. In the `.*` case, we now additionally also check for *any* placeholders (not just non-overload-sets) in the LHS; this shouldn’t make a difference, however—at least I couldn’t think of a way to trigger the assertion with an overload set as the LHS of `.*`; it is worth noting that the assertion in question would also complain if the LHS happened to be of placeholder type, though. 2. There is another case in which we also don’t perform overload resolution—namely `=` if the LHS is not of class or enumeration type after handling non-overload-set placeholders—as in the `.*` case, but similarly to 1., I first couldn’t think of a way of getting this case to crash, and secondly, `CreateBuiltinBinOp()` doesn’t seem to care about placeholders in the LHS or RHS in the `=` case (from what I can tell, it, or rather one of its callees, only checks that the LHS is not a pseudo-object type, but those will have already been handled by the call to `checkPlaceholderForOverload()` by the time we get to this function), so I don’t think this case suffers from the same problem. This fixes llvm#53815. --------- Co-authored-by: Aaron Ballman <[email protected]>
1 parent 9ca8db3 commit d23ef9e

File tree

3 files changed

+40
-5
lines changed

3 files changed

+40
-5
lines changed

clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ Bug Fixes to C++ Support
288288
templates when determining the primary template of an explicit specialization.
289289
- Fixed a crash in Microsoft compatibility mode where unqualified dependent base class
290290
lookup searches the bases of an incomplete class.
291+
- Fix a crash when an unresolved overload set is encountered on the RHS of a ``.*`` operator.
292+
(`#53815 <https://github.com/llvm/llvm-project/issues/53815>`_)
291293

292294
Bug Fixes to AST Handling
293295
^^^^^^^^^^^^^^^^^^^^^^^^^

clang/lib/Sema/SemaOverload.cpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14571,6 +14571,23 @@ ExprResult Sema::CreateOverloadedBinOp(SourceLocation OpLoc,
1457114571
CurFPFeatureOverrides());
1457214572
}
1457314573

14574+
// If this is the .* operator, which is not overloadable, just
14575+
// create a built-in binary operator.
14576+
if (Opc == BO_PtrMemD) {
14577+
auto CheckPlaceholder = [&](Expr *&Arg) {
14578+
ExprResult Res = CheckPlaceholderExpr(Arg);
14579+
if (Res.isUsable())
14580+
Arg = Res.get();
14581+
return !Res.isUsable();
14582+
};
14583+
14584+
// CreateBuiltinBinOp() doesn't like it if we tell it to create a '.*'
14585+
// expression that contains placeholders (in either the LHS or RHS).
14586+
if (CheckPlaceholder(Args[0]) || CheckPlaceholder(Args[1]))
14587+
return ExprError();
14588+
return CreateBuiltinBinOp(OpLoc, Opc, Args[0], Args[1]);
14589+
}
14590+
1457414591
// Always do placeholder-like conversions on the RHS.
1457514592
if (checkPlaceholderForOverload(*this, Args[1]))
1457614593
return ExprError();
@@ -14590,11 +14607,6 @@ ExprResult Sema::CreateOverloadedBinOp(SourceLocation OpLoc,
1459014607
if (Opc == BO_Assign && !Args[0]->getType()->isOverloadableType())
1459114608
return CreateBuiltinBinOp(OpLoc, Opc, Args[0], Args[1]);
1459214609

14593-
// If this is the .* operator, which is not overloadable, just
14594-
// create a built-in binary operator.
14595-
if (Opc == BO_PtrMemD)
14596-
return CreateBuiltinBinOp(OpLoc, Opc, Args[0], Args[1]);
14597-
1459814610
// Build the overload set.
1459914611
OverloadCandidateSet CandidateSet(OpLoc, OverloadCandidateSet::CSK_Operator,
1460014612
OverloadCandidateSet::OperatorRewriteInfo(

clang/test/SemaCXX/gh53815.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++20 %s
2+
// expected-no-diagnostics
3+
4+
// Check that we don't crash due to forgetting to check for placeholders
5+
// in the RHS of '.*'.
6+
7+
template <typename Fn>
8+
static bool has_explicitly_named_overload() {
9+
return requires { Fn().*&Fn::operator(); };
10+
}
11+
12+
int main() {
13+
has_explicitly_named_overload<decltype([](auto){})>();
14+
}
15+
16+
template <typename Fn>
17+
constexpr bool has_explicitly_named_overload_2() {
18+
return requires { Fn().*&Fn::operator(); };
19+
}
20+
21+
static_assert(!has_explicitly_named_overload_2<decltype([](auto){})>());

0 commit comments

Comments
 (0)