-
Notifications
You must be signed in to change notification settings - Fork 11.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[clang] static operators should evaluate object argument (reland) (#8…
…0108) This re-applies 30155fc with a fix for clangd. ### Description clang don't evaluate the object argument of `static operator()` and `static operator[]` currently, for example: ```cpp #include <iostream> struct Foo { static int operator()(int x, int y) { std::cout << "Foo::operator()" << std::endl; return x + y; } static int operator[](int x, int y) { std::cout << "Foo::operator[]" << std::endl; return x + y; } }; Foo getFoo() { std::cout << "getFoo()" << std::endl; return {}; } int main() { std::cout << getFoo()(1, 2) << std::endl; std::cout << getFoo()[1, 2] << std::endl; } ``` `getFoo()` is expected to be called, but clang don't call it currently (17.0.6). This PR fixes this issue. Fixes #67976, reland #68485. ### Walkthrough - **clang/lib/Sema/SemaOverload.cpp** - **`Sema::CreateOverloadedArraySubscriptExpr` & `Sema::BuildCallToObjectOfClassType`** Previously clang generate `CallExpr` for static operators, ignoring the object argument. In this PR `CXXOperatorCallExpr` is generated for static operators instead, with the object argument as the first argument. - **`TryObjectArgumentInitialization`** `const` / `volatile` objects are allowed for static methods, so that we can call static operators on them. - **clang/lib/CodeGen/CGExpr.cpp** - **`CodeGenFunction::EmitCall`** CodeGen changes for `CXXOperatorCallExpr` with static operators: emit and ignore the object argument first, then emit the operator call. - **clang/lib/AST/ExprConstant.cpp** - **`ExprEvaluatorBase::handleCallExpr`** Evaluation of static operators in constexpr also need some small changes to work, so that the arguments won't be out of position. - **clang/lib/Sema/SemaChecking.cpp** - **`Sema::CheckFunctionCall`** Code for argument checking also need to be modify, or it will fail the test `clang/test/SemaCXX/overloaded-operator-decl.cpp`. - **clang-tools-extra/clangd/InlayHints.cpp** - **`InlayHintVisitor::VisitCallExpr`** Now that the `CXXOperatorCallExpr` for static operators also have object argument, we should also take care of this situation in clangd. ### Tests - **Added:** - **clang/test/AST/ast-dump-static-operators.cpp** Verify the AST generated for static operators. - **clang/test/SemaCXX/cxx2b-static-operator.cpp** Static operators should be able to be called on const / volatile objects. - **Modified:** - **clang/test/CodeGenCXX/cxx2b-static-call-operator.cpp** - **clang/test/CodeGenCXX/cxx2b-static-subscript-operator.cpp** Matching the new CodeGen. ### Documentation - **clang/docs/ReleaseNotes.rst** Update release notes. --------- Co-authored-by: Shafik Yaghmour <shafik@users.noreply.github.com> Co-authored-by: cor3ntin <corentinjabot@gmail.com> Co-authored-by: Aaron Ballman <aaron@aaronballman.com>
- Loading branch information
4 people
committed
Jan 31, 2024
1 parent
3564666
commit ee01a2c
Showing
10 changed files
with
159 additions
and
47 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // RUN: %clang_cc1 -std=c++23 %s -ast-dump -triple x86_64-unknown-unknown -o - | FileCheck -strict-whitespace %s | ||
|
|
||
| struct Functor { | ||
| static int operator()(int x, int y) { | ||
| return x + y; | ||
| } | ||
| static int operator[](int x, int y) { | ||
| return x + y; | ||
| } | ||
| }; | ||
|
|
||
| Functor& get_functor() { | ||
| static Functor functor; | ||
| return functor; | ||
| } | ||
|
|
||
| void call_static_operators() { | ||
| Functor functor; | ||
|
|
||
| int z1 = functor(1, 2); | ||
| // CHECK: CXXOperatorCallExpr {{.*}} 'int' '()' | ||
| // CHECK-NEXT: |-ImplicitCastExpr {{.*}} <col:19, col:24> 'int (*)(int, int)' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:19, col:24> 'int (int, int)' lvalue CXXMethod {{.*}} 'operator()' 'int (int, int)' | ||
| // CHECK-NEXT: |-DeclRefExpr {{.*}} <col:12> 'Functor' lvalue Var {{.*}} 'functor' 'Functor' | ||
| // CHECK-NEXT: |-IntegerLiteral {{.*}} <col:20> 'int' 1 | ||
| // CHECK-NEXT: `-IntegerLiteral {{.*}} <col:23> 'int' 2 | ||
|
|
||
| int z2 = functor[1, 2]; | ||
| // CHECK: CXXOperatorCallExpr {{.*}} 'int' '[]' | ||
| // CHECK-NEXT: |-ImplicitCastExpr {{.*}} <col:19, col:24> 'int (*)(int, int)' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:19, col:24> 'int (int, int)' lvalue CXXMethod {{.*}} 'operator[]' 'int (int, int)' | ||
| // CHECK-NEXT: |-DeclRefExpr {{.*}} <col:12> 'Functor' lvalue Var {{.*}} 'functor' 'Functor' | ||
| // CHECK-NEXT: |-IntegerLiteral {{.*}} <col:20> 'int' 1 | ||
| // CHECK-NEXT: `-IntegerLiteral {{.*}} <col:23> 'int' 2 | ||
|
|
||
| int z3 = get_functor()(1, 2); | ||
| // CHECK: CXXOperatorCallExpr {{.*}} 'int' '()' | ||
| // CHECK-NEXT: |-ImplicitCastExpr {{.*}} <col:25, col:30> 'int (*)(int, int)' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:25, col:30> 'int (int, int)' lvalue CXXMethod {{.*}} 'operator()' 'int (int, int)' | ||
| // CHECK-NEXT: |-CallExpr {{.*}} <col:12, col:24> 'Functor' lvalue | ||
| // CHECK-NEXT: | `-ImplicitCastExpr {{.*}} <col:12> 'Functor &(*)()' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:12> 'Functor &()' lvalue Function {{.*}} 'get_functor' 'Functor &()' | ||
| // CHECK-NEXT: |-IntegerLiteral {{.*}} <col:26> 'int' 1 | ||
| // CHECK-NEXT: `-IntegerLiteral {{.*}} <col:29> 'int' 2 | ||
|
|
||
| int z4 = get_functor()[1, 2]; | ||
| // CHECK: CXXOperatorCallExpr {{.*}} 'int' '[]' | ||
| // CHECK-NEXT: |-ImplicitCastExpr {{.*}} <col:25, col:30> 'int (*)(int, int)' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:25, col:30> 'int (int, int)' lvalue CXXMethod {{.*}} 'operator[]' 'int (int, int)' | ||
| // CHECK-NEXT: |-CallExpr {{.*}} <col:12, col:24> 'Functor' lvalue | ||
| // CHECK-NEXT: | `-ImplicitCastExpr {{.*}} <col:12> 'Functor &(*)()' <FunctionToPointerDecay> | ||
| // CHECK-NEXT: | `-DeclRefExpr {{.*}} <col:12> 'Functor &()' lvalue Function {{.*}} 'get_functor' 'Functor &()' | ||
| // CHECK-NEXT: |-IntegerLiteral {{.*}} <col:26> 'int' 1 | ||
| // CHECK-NEXT: `-IntegerLiteral {{.*}} <col:29> 'int' 2 | ||
| } |
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // RUN: %clang_cc1 -fsyntax-only -verify -std=c++23 %s | ||
|
|
||
| // expected-no-diagnostics | ||
|
|
||
| namespace A { | ||
|
|
||
| struct Foo { | ||
| static int operator()(int a, int b) { return a + b; } | ||
| static int operator[](int a, int b) { return a + b; } | ||
| }; | ||
|
|
||
| void ok() { | ||
| // Should pass regardless of const / volatile | ||
| Foo foo; | ||
| foo(1, 2); | ||
| foo[1, 2]; | ||
|
|
||
| const Foo fooC; | ||
| fooC(1, 2); | ||
| fooC[1, 2]; | ||
|
|
||
| const Foo fooV; | ||
| fooV(1, 2); | ||
| fooV[1, 2]; | ||
|
|
||
| const volatile Foo fooCV; | ||
| fooCV(1, 2); | ||
| fooCV[1, 2]; | ||
| } | ||
|
|
||
| } |