Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-06 01:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[clang][Interp] Convert logical binop operands to bool

Browse Source 
Differential Revision: https://reviews.llvm.org/D157174
This commit is contained in:
Timm Bäder 2023-08-05 07:47:22 +02:00
parent 08b7a71bcc
commit a259005a21
2 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
clang/lib/AST/Interp/ByteCodeExprGen.cpp
View File

@ -394,18 +394,19 @@ bool ByteCodeExprGen<Emitter>::VisitLogicalBinOp(const BinaryOperator *E) {
BinaryOperatorKind Op = E->getOpcode();
const Expr *LHS = E->getLHS();
const Expr *RHS = E->getRHS();
std::optional<PrimType> T = classify(E->getType());
if (Op == BO_LOr) {
// Logical OR. Visit LHS and only evaluate RHS if LHS was FALSE.
LabelTy LabelTrue = this->getLabel();
LabelTy LabelEnd = this->getLabel();
if (!this->visit(LHS))
if (!this->visitBool(LHS))
return false;
if (!this->jumpTrue(LabelTrue))
return false;
if (!this->visit(RHS))
if (!this->visitBool(RHS))
return false;
if (!this->jump(LabelEnd))
return false;
@ -415,35 +416,36 @@ bool ByteCodeExprGen<Emitter>::VisitLogicalBinOp(const BinaryOperator *E) {
this->fallthrough(LabelEnd);
this->emitLabel(LabelEnd);
if (DiscardResult)
return this->emitPopBool(E);
} else {
assert(Op == BO_LAnd);
// Logical AND.
// Visit LHS. Only visit RHS if LHS was TRUE.
LabelTy LabelFalse = this->getLabel();
LabelTy LabelEnd = this->getLabel();
return true;
if (!this->visitBool(LHS))
return false;
if (!this->jumpFalse(LabelFalse))
return false;
if (!this->visitBool(RHS))
return false;
if (!this->jump(LabelEnd))
return false;
this->emitLabel(LabelFalse);
this->emitConstBool(false, E);
this->fallthrough(LabelEnd);
this->emitLabel(LabelEnd);
}
// Logical AND.
// Visit LHS. Only visit RHS if LHS was TRUE.
LabelTy LabelFalse = this->getLabel();
LabelTy LabelEnd = this->getLabel();
if (!this->visit(LHS))
return false;
if (!this->jumpFalse(LabelFalse))
return false;
if (!this->visit(RHS))
return false;
if (!this->jump(LabelEnd))
return false;
this->emitLabel(LabelFalse);
this->emitConstBool(false, E);
this->fallthrough(LabelEnd);
this->emitLabel(LabelEnd);
if (DiscardResult)
return this->emitPopBool(E);
// For C, cast back to integer type.
assert(T);
if (T != PT_Bool)
return this->emitCast(PT_Bool, *T, E);
return true;
}
@ -815,17 +817,9 @@ bool ByteCodeExprGen<Emitter>::VisitAbstractConditionalOperator(
LabelTy LabelEnd = this->getLabel(); // Label after the operator.
LabelTy LabelFalse = this->getLabel(); // Label for the false expr.
if (!this->visit(Condition))
if (!this->visitBool(Condition))
return false;
// C special case: Convert to bool because our jump ops need that.
// TODO: We probably want this to be done in visitBool().
if (std::optional<PrimType> CondT = classify(Condition->getType());
CondT && CondT != PT_Bool) {
if (!this->emitCast(*CondT, PT_Bool, E))
return false;
}
if (!this->jumpFalse(LabelFalse))
return false;
@ -1551,9 +1545,29 @@ bool ByteCodeExprGen<Emitter>::visitInitializer(const Expr *E) {
template <class Emitter>
bool ByteCodeExprGen<Emitter>::visitBool(const Expr *E) {
if (std::optional<PrimType> T = classify(E->getType()))
return visit(E);
return this->bail(E);
std::optional<PrimType> T = classify(E->getType());
if (!T)
return false;
if (!this->visit(E))
return false;
if (T == PT_Bool)
return true;
// Convert pointers to bool.
if (T == PT_Ptr || T == PT_FnPtr) {
if (!this->emitNull(*T, E))
return false;
return this->emitNE(*T, E);
}
// Or Floats.
if (T == PT_Float)
return this->emitCastFloatingIntegralBool(E);
// Or anything else we can.
return this->emitCast(*T, PT_Bool, E);
}
template <class Emitter>

2
clang/test/AST/Interp/c.c
View File

@ -9,6 +9,8 @@ _Static_assert(1, "");
_Static_assert(0 != 1, "");
_Static_assert(1.0 == 1.0, ""); // pedantic-ref-warning {{not an integer constant expression}} \
// pedantic-expected-warning {{not an integer constant expression}}
_Static_assert(1 && 1.0, ""); // pedantic-ref-warning {{not an integer constant expression}} \
// pedantic-expected-warning {{not an integer constant expression}}
_Static_assert( (5 > 4) + (3 > 2) == 2, "");
/// FIXME: Should also be rejected in the new interpreter