Update for LLVM API change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75446 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 94d0789..23b68c3 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -119,10 +119,10 @@
return llvm::ConstantInt::get(ConvertType(E->getType()), E->getValue());
}
Value *VisitCXXZeroInitValueExpr(const CXXZeroInitValueExpr *E) {
- return llvm::Constant::getNullValue(ConvertType(E->getType()));
+ return CGF.getLLVMContext().getNullValue(ConvertType(E->getType()));
}
Value *VisitGNUNullExpr(const GNUNullExpr *E) {
- return llvm::Constant::getNullValue(ConvertType(E->getType()));
+ return CGF.getLLVMContext().getNullValue(ConvertType(E->getType()));
}
Value *VisitTypesCompatibleExpr(const TypesCompatibleExpr *E) {
return llvm::ConstantInt::get(ConvertType(E->getType()),
@@ -211,7 +211,7 @@
// Emit remaining default initializers
for (/* Do not initialize i*/; i < NumVectorElements; ++i) {
Value *Idx = llvm::ConstantInt::get(llvm::Type::Int32Ty, i);
- llvm::Value *NewV = llvm::Constant::getNullValue(ElementType);
+ llvm::Value *NewV = CGF.getLLVMContext().getNullValue(ElementType);
V = Builder.CreateInsertElement(V, NewV, Idx);
}
@@ -219,7 +219,7 @@
}
Value *VisitImplicitValueInitExpr(const ImplicitValueInitExpr *E) {
- return llvm::Constant::getNullValue(ConvertType(E->getType()));
+ return CGF.getLLVMContext().getNullValue(ConvertType(E->getType()));
}
Value *VisitImplicitCastExpr(const ImplicitCastExpr *E);
Value *VisitCastExpr(const CastExpr *E) {
@@ -385,7 +385,7 @@
if (SrcType->isRealFloatingType()) {
// Compare against 0.0 for fp scalars.
- llvm::Value *Zero = llvm::Constant::getNullValue(Src->getType());
+ llvm::Value *Zero = CGF.getLLVMContext().getNullValue(Src->getType());
return Builder.CreateFCmpUNE(Src, Zero, "tobool");
}
@@ -408,7 +408,7 @@
}
// Compare against an integer or pointer null.
- llvm::Value *Zero = llvm::Constant::getNullValue(Src->getType());
+ llvm::Value *Zero = CGF.getLLVMContext().getNullValue(Src->getType());
return Builder.CreateICmpNE(Src, Zero, "tobool");
}
@@ -808,7 +808,7 @@
CGF.EmitLValue(Op);
else
CGF.EmitScalarExpr(Op, true);
- return llvm::Constant::getNullValue(ConvertType(E->getType()));
+ return CGF.getLLVMContext().getNullValue(ConvertType(E->getType()));
}
Value *ScalarExprEmitter::VisitUnaryOffsetOf(const UnaryOperator *E)
@@ -1279,7 +1279,7 @@
// 0 && RHS: If it is safe, just elide the RHS, and return 0.
if (!CGF.ContainsLabel(E->getRHS()))
- return llvm::Constant::getNullValue(CGF.LLVMIntTy);
+ return CGF.getLLVMContext().getNullValue(CGF.LLVMIntTy);
}
llvm::BasicBlock *ContBlock = CGF.createBasicBlock("land.end");