2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 6077f8e61c1..1a583a71584 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -1022,7 +1022,7 @@ Value *ScalarExprEmitter::VisitBinLAnd(const BinaryOperator *E) {
   
   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 @@ Value *ScalarExprEmitter::VisitBinLOr(const BinaryOperator *E) {
   
   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 @@ VisitConditionalOperator(const ConditionalOperator *E) {
   // 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/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
index daad3f5e798..7f9ca7af7fe 100644
--- a/clang/lib/CodeGen/CGStmt.cpp
+++ b/clang/lib/CodeGen/CGStmt.cpp
@@ -233,7 +233,7 @@ void CodeGenFunction::EmitIfStmt(const IfStmt &S) {
   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.