Clean up some code to use isZero instead of calling getZExtValue.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59103 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 6077f8e..1a583a7 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1022,7 +1022,7 @@
if (llvm::ConstantInt *LHSCst = dyn_cast<llvm::ConstantInt>(LHSCond)) {
// If we have 0 && RHS, see if we can elide RHS, if so, just return LHSCond.
- if (LHSCst->getZExtValue() == 0) {
+ if (LHSCst->isZero()) {
if (!CGF.ContainsLabel(E->getRHS()))
// Elide RHS, return 0
return llvm::Constant::getNullValue(CGF.LLVMIntTy);
@@ -1063,7 +1063,7 @@
if (llvm::ConstantInt *LHSCst = dyn_cast<llvm::ConstantInt>(LHSCond)) {
// If we have 1 || RHS, see if we can elide RHS, if so, just return LHSCond.
- if (LHSCst->getZExtValue() != 0) {
+ if (!LHSCst->isZero()) {
if (!CGF.ContainsLabel(E->getRHS()))
// Elide RHS, return 1
return llvm::ConstantInt::get(CGF.LLVMIntTy, 1);
@@ -1120,7 +1120,7 @@
// can't do this if the dead side contains a label.
if (llvm::ConstantInt *CondCI = dyn_cast<llvm::ConstantInt>(CondVal)) {
Expr *Live = E->getLHS(), *Dead = E->getRHS();
- if (CondCI->getZExtValue() == 0)
+ if (CondCI->isZero())
std::swap(Live, Dead);
if (!Dead || !CGF.ContainsLabel(Dead)) {
// Emit the live side.
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index daad3f5..7f9ca7a 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -233,7 +233,7 @@
if (llvm::ConstantInt *CondCst = dyn_cast<llvm::ConstantInt>(BoolCondVal)) {
// Figure out which block (then or else) is executed.
const Stmt *Executed = S.getThen(), *Skipped = S.getElse();
- if (!CondCst->getZExtValue())
+ if (CondCst->isZero())
std::swap(Executed, Skipped);
// If the skipped block has no labels in it, just emit the executed block.