This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG81522a012acc: [clang][Interp] Optionally cast comparison result to non-bool (authored by tbaeder).
Changed prior to commit: https://reviews.llvm.org/D149645?vs=518707&id=526989#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D149645/new/ https://reviews.llvm.org/D149645 Files: clang/lib/AST/Interp/ByteCodeExprGen.cpp clang/test/AST/Interp/c.c Index: clang/test/AST/Interp/c.c =================================================================== --- /dev/null +++ clang/test/AST/Interp/c.c @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -verify %s +// RUN: %clang_cc1 -verify=ref %s + +/// expected-no-diagnostics +/// ref-no-diagnostics + +_Static_assert(1, ""); +_Static_assert(0 != 1, ""); +_Static_assert(1.0 == 1.0, ""); +_Static_assert( (5 > 4) + (3 > 2) == 2, ""); Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp =================================================================== --- clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -237,19 +237,31 @@ if (!visit(LHS) || !visit(RHS)) return false; + // For languages such as C, cast the result of one + // of our comparision opcodes to T (which is usually int). + auto MaybeCastToBool = [this, T, BO](bool Result) { + if (!Result) + return false; + if (DiscardResult) + return this->emitPop(*T, BO); + if (T != PT_Bool) + return this->emitCast(PT_Bool, *T, BO); + return true; + }; + switch (BO->getOpcode()) { case BO_EQ: - return Discard(this->emitEQ(*LT, BO)); + return MaybeCastToBool(this->emitEQ(*LT, BO)); case BO_NE: - return Discard(this->emitNE(*LT, BO)); + return MaybeCastToBool(this->emitNE(*LT, BO)); case BO_LT: - return Discard(this->emitLT(*LT, BO)); + return MaybeCastToBool(this->emitLT(*LT, BO)); case BO_LE: - return Discard(this->emitLE(*LT, BO)); + return MaybeCastToBool(this->emitLE(*LT, BO)); case BO_GT: - return Discard(this->emitGT(*LT, BO)); + return MaybeCastToBool(this->emitGT(*LT, BO)); case BO_GE: - return Discard(this->emitGE(*LT, BO)); + return MaybeCastToBool(this->emitGE(*LT, BO)); case BO_Sub: if (BO->getType()->isFloatingType()) return Discard(this->emitSubf(getRoundingMode(BO), BO));
Index: clang/test/AST/Interp/c.c =================================================================== --- /dev/null +++ clang/test/AST/Interp/c.c @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -verify %s +// RUN: %clang_cc1 -verify=ref %s + +/// expected-no-diagnostics +/// ref-no-diagnostics + +_Static_assert(1, ""); +_Static_assert(0 != 1, ""); +_Static_assert(1.0 == 1.0, ""); +_Static_assert( (5 > 4) + (3 > 2) == 2, ""); Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp =================================================================== --- clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -237,19 +237,31 @@ if (!visit(LHS) || !visit(RHS)) return false; + // For languages such as C, cast the result of one + // of our comparision opcodes to T (which is usually int). + auto MaybeCastToBool = [this, T, BO](bool Result) { + if (!Result) + return false; + if (DiscardResult) + return this->emitPop(*T, BO); + if (T != PT_Bool) + return this->emitCast(PT_Bool, *T, BO); + return true; + }; + switch (BO->getOpcode()) { case BO_EQ: - return Discard(this->emitEQ(*LT, BO)); + return MaybeCastToBool(this->emitEQ(*LT, BO)); case BO_NE: - return Discard(this->emitNE(*LT, BO)); + return MaybeCastToBool(this->emitNE(*LT, BO)); case BO_LT: - return Discard(this->emitLT(*LT, BO)); + return MaybeCastToBool(this->emitLT(*LT, BO)); case BO_LE: - return Discard(this->emitLE(*LT, BO)); + return MaybeCastToBool(this->emitLE(*LT, BO)); case BO_GT: - return Discard(this->emitGT(*LT, BO)); + return MaybeCastToBool(this->emitGT(*LT, BO)); case BO_GE: - return Discard(this->emitGE(*LT, BO)); + return MaybeCastToBool(this->emitGE(*LT, BO)); case BO_Sub: if (BO->getType()->isFloatingType()) return Discard(this->emitSubf(getRoundingMode(BO), BO));
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits