Update GetBinaryOperator to GetOperator
#394
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #394 +/- ##
==========================================
- Coverage 70.87% 70.85% -0.02%
==========================================
Files 9 9
Lines 3533 3538 +5
==========================================
+ Hits 2504 2507 +3
- Misses 1029 1031 +2
|
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
3c7449a to
5f7c378
Compare
Vipul-Cariappa
force-pushed
the
dev/operators
branch
2 times, most recently
from
371ef22 to
709371e
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| OP_Coawait, | ||
| }; | ||
|
|
||
| enum OperatorKind { |
There was a problem hiding this comment.
warning: enum 'OperatorKind' uses a larger base type ('unsigned int', size: 4 bytes) than necessary for its value set, consider using 'std::uint8_t' (1 byte) as the base type to reduce its size [performance-enum-size]
enum OperatorKind {
^| if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) { | ||
| if (FD->isOverloadedOperator()) { | ||
| switch (FD->getOverloadedOperator()) { | ||
| #define OVERLOADED_OPERATOR(Name, Spelling, Token, Unary, Binary, \ |
There was a problem hiding this comment.
warning: function-like macro 'OVERLOADED_OPERATOR' used; consider a 'constexpr' template function [cppcoreguidelines-macro-usage]
#define OVERLOADED_OPERATOR(Name, Spelling, Token, Unary, Binary, \
^There was a problem hiding this comment.
That type of check should be disabled in our clang-tidy config..
| kUnary = 0b001, | ||
| kBinary = 0b010, | ||
| kBoth = 0b011, |
There was a problem hiding this comment.
I guess we won't or these, 1,2,3 should be fine...
| OP_Coawait, | ||
| }; | ||
|
|
||
| enum OperatorKind { |
There was a problem hiding this comment.
| enum OperatorKind { | |
| enum OperatorArity { |
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
709371e to
8277fe9
Compare
| }; | ||
|
|
||
| enum OperatorArity { kUnary = 1, kBinary, kBoth }; |
There was a problem hiding this comment.
warning: enum 'OperatorArity' uses a larger base type ('unsigned int', size: 4 bytes) than necessary for its value set, consider using 'std::uint8_t' (1 byte) as the base type to reduce its size [performance-enum-size]
enum OperatorArity { kUnary = 1, kBinary, kBoth };
^
lib/Interpreter/CppInterOp.cpp
Outdated
| @@ -3262,22 +3262,56 @@ namespace Cpp { | |||
| return PI->getNameAsString(); | |||
| } | |||
|
|
|||
| void GetBinaryOperator(TCppScope_t scope, enum BinaryOperator op, | |||
| std::vector<TCppFunction_t>& operators) { | |||
| bool IsUnaryOperator(TCppScope_t scope) { | |||
There was a problem hiding this comment.
warning: redundant explicit casting to the same type 'Expr *' as the sub-expression, remove this casting [readability-redundant-casting]
| bool IsUnaryOperator(TCppScope_t scope) { | |
| Expr *DefaultArgExpr = PI->getDefaultArg(); |
Additional context
llvm/include/clang/AST/Decl.h:1809: source type originates from the invocation of this method
Expr *getDefaultArg();
^| switch (FD->getOverloadedOperator()) { | ||
| #define OVERLOADED_OPERATOR(Name, Spelling, Token, Unary, Binary, \ | ||
| MemberOnly) \ | ||
| case OO_##Name: \ |
There was a problem hiding this comment.
warning: do not use C-style cast to convert between unrelated types [cppcoreguidelines-pro-type-cstyle-cast]
auto *D = (clang::Decl *)method;
^| } | ||
| } | ||
| return false; | ||
| } |
There was a problem hiding this comment.
warning: do not use C-style cast to convert between unrelated types [cppcoreguidelines-pro-type-cstyle-cast]
auto *D = (clang::Decl *)func;
^| if (auto* DC = llvm::dyn_cast_or_null<DeclContext>(D)) { | ||
| ASTContext& C = getSema().getASTContext(); | ||
| DeclContextLookupResult Result = | ||
| DC->lookup(C.DeclarationNames.getCXXOperatorName( |
There was a problem hiding this comment.
warning: Called C++ object pointer is null [clang-analyzer-core.CallAndMessage]
return PI->getNameAsString();
^Additional context
lib/Interpreter/CppInterOp.cpp:3299: 'PI' initialized to a null pointer value
clang::ParmVarDecl* PI = nullptr;
^lib/Interpreter/CppInterOp.cpp:3301: Assuming null pointer is passed into cast
if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3301: 'FD' is null
if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3301: Taking false branch
if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3303: Assuming null pointer is passed into cast
else if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionTemplateDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3303: 'FD' is null
else if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionTemplateDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3303: Taking false branch
else if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionTemplateDecl>(D))
^lib/Interpreter/CppInterOp.cpp:3306: Called C++ object pointer is null
return PI->getNameAsString();
^
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
8277fe9 to
fb19bfc
Compare
| }; | ||
|
|
||
| enum OperatorArity { kUnary = 1, kBinary, kBoth }; |
There was a problem hiding this comment.
| enum OperatorArity { kUnary = 1, kBinary, kBoth }; | |
| enum OperatorArity { kBoth = 0, kUnary, kBinary }; |
There was a problem hiding this comment.
I did not understand this.
All Unary operators are not Binary operators. So kBoth = 0 and kUnary = 0 is confusing. Example ~ operator.
There was a problem hiding this comment.
Sorry, my bad, fixed the suggestion.
| void GetBinaryOperator(TCppScope_t scope, enum BinaryOperator op, | ||
| std::vector<TCppFunction_t>& operators); | ||
| ///\returns true if scope is a unary operator | ||
| bool IsUnaryOperator(TCppScope_t scope); |
There was a problem hiding this comment.
| bool IsUnaryOperator(TCppScope_t scope); | |
| bool IsUnaryOperator(TCppFunction_t op); |
| bool IsUnaryOperator(TCppScope_t scope); | ||
|
|
||
| ///\returns true if scope is a binary operator | ||
| bool IsBinaryOperator(TCppScope_t scope); |
There was a problem hiding this comment.
| bool IsBinaryOperator(TCppScope_t scope); | |
| bool IsBinaryOperator(TCppFunction_t op); |
| if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) { | ||
| if (FD->isOverloadedOperator()) { | ||
| switch (FD->getOverloadedOperator()) { | ||
| #define OVERLOADED_OPERATOR(Name, Spelling, Token, Unary, Binary, \ |
There was a problem hiding this comment.
That type of check should be disabled in our clang-tidy config..
lib/Interpreter/CppInterOp.cpp
Outdated
| if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) { | ||
| if (FD->isOverloadedOperator()) { | ||
| switch (FD->getOverloadedOperator()) { | ||
| #define OVERLOADED_OPERATOR(Name, Spelling, Token, Unary, Binary, \ | ||
| MemberOnly) \ | ||
| case OO_##Name: \ | ||
| return Unary; | ||
| #include "clang/Basic/OperatorKinds.def" | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
We should move that into a utility function, write the switch such that it returns
OperatorArity getOperatorArity(...) {
if (Unary && Binary) return kBoth; ...
}
fb19bfc to
2c83c8d
Compare
| }; | ||
|
|
||
| enum OperatorArity { kNone, kUnary, kBinary, kBoth }; |
There was a problem hiding this comment.
warning: enum 'OperatorArity' uses a larger base type ('unsigned int', size: 4 bytes) than necessary for its value set, consider using 'std::uint8_t' (1 byte) as the base type to reduce its size [performance-enum-size]
enum OperatorArity { kNone, kUnary, kBinary, kBoth };
^
lib/Interpreter/CppInterOp.cpp
Outdated
| } | ||
| } | ||
| } | ||
| return kNone; |
There was a problem hiding this comment.
That should be unreachable, right? What does it mean arity::kNone? An operator without arguments? I do not think that's possible.
There was a problem hiding this comment.
Yes, should be unreachable.
It is for cases when the argument is something other than an operator or a function that is not an operator.
There was a problem hiding this comment.
Shouldn't that be an assert or an early exit?
There was a problem hiding this comment.
I will say this is simpler. Assert will crash the program. In this case, the user can handle kNone as an error.
Also if I remove the return, clang-tidy will get angry.
Let me know if you still think we should remove kNone. I can do that, but not sure how I would satisfy clang-tidy's message of Non-void function does not return a value in all control paths.
There was a problem hiding this comment.
You should remove it. You can return ~0U
There was a problem hiding this comment.
Compiler error:
/home/vipul-cariappa/Workspace/cpp-py/compiler-research/CppInterOp/lib/Interpreter/CppInterOp.cpp:3339:12: error: invalid conversion from ‘unsigned int’ to ‘Cpp::OperatorArity’ [-fpermissive]
3339 | return ~0U;
| ^~~
| |
| unsigned intShould I rename it to kInvalid instead?
There was a problem hiding this comment.
Cast it to OperatorArity?
lib/Interpreter/CppInterOp.cpp
Outdated
| if (auto* FD = llvm::dyn_cast<Decl>(D)) | ||
| operators.push_back(FD); | ||
| for (auto* i : Result) { | ||
| if (kind & getOperatorArity(i)) |
There was a problem hiding this comment.
| if (kind & getOperatorArity(i)) | |
| if (kind == getOperatorArity(i)) |
There was a problem hiding this comment.
When kind = kBoth should we return Unary Binary or Unary Binary?
This logic using & returns Unary Binary.
Whereas == will return Unary Binary.
Operators like - is both Unary and Binary.
I set the enum OperatorArity values so that I can perform this bitwise operation.
There was a problem hiding this comment.
When I say kBoth, I expect all unary and binary operators to be present in that list.
There was a problem hiding this comment.
In that case, we should be using &. kUnary = 0b001 and kBinary = 0b010 and kBoth = kUnary ^ kBinary = 0b011.
No changes are required here.
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
2c83c8d to
ce7d778
Compare
|
Do we know why the check if failing? |
Looks like the API update in cppyy-backend was not pulled, rerunning now. should be green |
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
ce7d778 to
b32d28b
Compare
| } | ||
| } | ||
| } | ||
| return (OperatorArity)~0U; |
There was a problem hiding this comment.
warning: The value '4294967295' provided to the cast expression is not in the valid range of values for 'OperatorArity' [clang-analyzer-optin.core.EnumCastOutOfRange]
return (OperatorArity)~0U;
^Additional context
include/clang/Interpreter/CppInterOp.h:88: enum declared here
enum OperatorArity { kUnary = 1, kBinary, kBoth };
^lib/Interpreter/CppInterOp.cpp:3319: Assuming 'D' is not a 'CastReturnType'
if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) {
^lib/Interpreter/CppInterOp.cpp:3319: 'FD' is null
if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) {
^lib/Interpreter/CppInterOp.cpp:3319: Taking false branch
if (auto* FD = llvm::dyn_cast<FunctionDecl>(D)) {
^lib/Interpreter/CppInterOp.cpp:3338: The value '4294967295' provided to the cast expression is not in the valid range of values for 'OperatorArity'
return (OperatorArity)~0U;
^
resolving unary operators and operators defined within namespaces
Vipul-Cariappa
force-pushed
the
dev/operators
branch
from
b32d28b to
6cf8923
Compare
`test03_stllike_preinc` fixed by compiler-research/CppInterOp#401 others fixed by compiler-research/CppInterOp#394
`test03_stllike_preinc` fixed by compiler-research/CppInterOp#401 others fixed by compiler-research/CppInterOp#394
Description
Resolving unary operators and operators defined within namespaces.
Required for
+op instd::string.Fixes (issue)
Three issues at cppyy. Requires a patch for both CPyCppyy and cppyy-backend.
Type of change
Please tick all options which are relevant.
Testing
I have added in tests cases for unary operator lookup and lookup of operator within a namespace.
Checklist