[Clang] Static and explicit object member functions with the same parameter-type-lists #93430
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -899,6 +899,8 @@ class Sema; | |
| /// object argument. | ||
| bool IgnoreObjectArgument : 1; | ||
|
|
||
| bool TookAddressOfOverload : 1; | ||
|
There was a problem hiding this comment. CC @Endilll -- it might be nice to refactor this code to use |
||
|
|
||
| /// True if the candidate was found using ADL. | ||
| CallExpr::ADLCallKind IsADLCandidate : 1; | ||
|
|
||
|
|
@@ -999,6 +1001,10 @@ class Sema; | |
| /// Initialization of an object of class type by constructor, | ||
| /// using either a parenthesized or braced list of arguments. | ||
| CSK_InitByConstructor, | ||
|
|
||
| /// C++ [over.match.call.general] | ||
| /// Resolve a call through the address of an overload set. | ||
| CSK_AddressOfOverloadSet, | ||
cor3ntin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| /// Information about operator rewrites to consider when adding operator | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5813,6 +5813,27 @@ static TypoCorrection TryTypoCorrectionForCall(Sema &S, Expr *Fn, | |
| return TypoCorrection(); | ||
| } | ||
|
|
||
| // [C++26][[expr.unary.op]/p4 | ||
| // A pointer to member is only formed when an explicit & | ||
| // is used and its operand is a qualified-id not enclosed in parentheses. | ||
| static bool isParenthetizedAndQualifiedAddressOfExpr(Expr *Fn) { | ||
| if (!isa<ParenExpr>(Fn)) | ||
| return false; | ||
|
|
||
| Fn = Fn->IgnoreParens(); | ||
|
There was a problem hiding this comment. Should we also ignore implicit casts along the way here for all of these? There was a problem hiding this comment. Nope, Any cast would make it a different shape than |
||
|
|
||
| auto *UO = dyn_cast<UnaryOperator>(Fn); | ||
| if (!UO || UO->getOpcode() != clang::UO_AddrOf) | ||
| return false; | ||
| if (auto *DRE = dyn_cast<DeclRefExpr>(UO->getSubExpr()->IgnoreParens())) { | ||
| assert(isa<FunctionDecl>(DRE->getDecl()) && "expected a function"); | ||
|
There was a problem hiding this comment. @cor3ntin, this assert is failing for a simple test (https://godbolt.org/z/Ye88sxfo8): int bar(void) { return 55; }
int (&fref)(void) = bar;
int main(void) {
return (&fref)();
}There was a problem hiding this comment. Ack. I'll get to it this week. Thanks for letting me know There was a problem hiding this comment. Ping re: regression (assertion failure) @cor3ntin There was a problem hiding this comment. ... I completely forgot (busy month!), thanks for reminding me. |
||
| return DRE->hasQualifier(); | ||
| } | ||
| if (auto *OVL = dyn_cast<OverloadExpr>(UO->getSubExpr()->IgnoreParens())) | ||
| return OVL->getQualifier(); | ||
| return false; | ||
| } | ||
|
|
||
| /// ConvertArgumentsForCall - Converts the arguments specified in | ||
| /// Args/NumArgs to the parameter types of the function FDecl with | ||
| /// function prototype Proto. Call is the call expression itself, and | ||
|
|
@@ -5834,8 +5855,10 @@ Sema::ConvertArgumentsForCall(CallExpr *Call, Expr *Fn, | |
|
|
||
| // C99 6.5.2.2p7 - the arguments are implicitly converted, as if by | ||
| // assignment, to the types of the corresponding parameter, ... | ||
|
|
||
| bool AddressOf = isParenthetizedAndQualifiedAddressOfExpr(Fn); | ||
| bool HasExplicitObjectParameter = | ||
| !AddressOf && FDecl && FDecl->hasCXXExplicitFunctionObjectParameter(); | ||
| unsigned ExplicitObjectParameterOffset = HasExplicitObjectParameter ? 1 : 0; | ||
| unsigned NumParams = Proto->getNumParams(); | ||
| bool Invalid = false; | ||
|
|
@@ -6546,7 +6569,7 @@ ExprResult Sema::BuildCallExpr(Scope *Scope, Expr *Fn, SourceLocation LParenLoc, | |
| OverloadExpr::FindResult find = OverloadExpr::find(Fn); | ||
|
|
||
| // We aren't supposed to apply this logic if there's an '&' involved. | ||
| if (!find.HasFormOfMemberPointer || find.IsAddressOfOperandWithParen) { | ||
| if (Expr::hasAnyTypeDependentArguments(ArgExprs)) | ||
| return CallExpr::Create(Context, Fn, ArgExprs, Context.DependentTy, | ||
| VK_PRValue, RParenLoc, CurFPFeatureOverrides()); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cleanup nit: I would vastly prefer FindResult have a constructor & deleted default constructor. This seems like it would be really easy to forget to initialize on some branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a default member initializer for everything