// FIXME: Are initializers affected by volatile?
if (Dest.isZeroed() && isSimpleZero(E, CGF)) {
// Storing "i32 0" to a zero'd memory location is a noop.
- } else if (isa<ImplicitValueInitExpr>(E) || isa<CXXScalarValueInitExpr>(E)) {
+ } else if (isa<ImplicitValueInitExpr>(E)) {
EmitNullInitializationToLValue(LV);
} else if (type->isReferenceType()) {
RValue RV = CGF.EmitReferenceBindingToExpr(E, /*InitializedDecl=*/0);
return;
if (!CGF.hasAggregateLLVMType(type)) {
- // For non-aggregates, we can store the appropriate null constant.
- llvm::Value *null = CGF.CGM.EmitNullConstant(type);
+ // For non-aggregates, we can store zero.
+ llvm::Value *null = llvm::Constant::getNullValue(CGF.ConvertType(type));
// Note that the following is not equivalent to
// EmitStoreThroughBitfieldLValue for ARC types.
if (lv.isBitField()) {
Value *VisitInitListExpr(InitListExpr *E);
Value *VisitImplicitValueInitExpr(const ImplicitValueInitExpr *E) {
- return EmitNullValue(E->getType());
+ return CGF.CGM.EmitNullConstant(E->getType());
}
Value *VisitExplicitCastExpr(ExplicitCastExpr *E) {
if (E->getType()->isVariablyModifiedType())
}
Value *ScalarExprEmitter::EmitNullValue(QualType Ty) {
- return CGF.CGM.EmitNullConstant(Ty);
+ if (const MemberPointerType *MPT = Ty->getAs<MemberPointerType>())
+ return CGF.CGM.getCXXABI().EmitNullMemberPointer(MPT);
+
+ return llvm::Constant::getNullValue(ConvertType(Ty));
}
/// \brief Emit a sanitization check for the given "binary" operation (which
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 -S -emit-llvm -o - %s | FileCheck %s
-// CHECK: @[[THREE_NULL_MEMPTRS:.*]] = private constant [3 x i32] [i32 -1, i32 -1, i32 -1]
-
struct A { int a[1]; };
typedef A x[];
int f() {
// CHECK: define i32 @_Z1fv
// CHECK: store i32 1
// (It's okay if the output changes here, as long as we don't crash.)
- return 0;
-}
-
-namespace ValueInitArrayOfMemPtr {
- struct S {};
- typedef int (S::*p);
- typedef p a[3];
- void f(const a &);
-
- struct Agg1 {
- int n;
- p x;
- };
-
- struct Agg2 {
- int n;
- a x;
- };
-
- struct S1 {
- p x;
- S1();
- };
-
- // CHECK: define void @_ZN22ValueInitArrayOfMemPtr1fEi
- void f(int n) {
- Agg1 a = { n };
- // CHECK: store i32 -1,
-
- Agg2 b = { n };
- // CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %{{.*}}, i8* bitcast ([3 x i32]* @[[THREE_NULL_MEMPTRS]] to i8*), i32 12, i32 4, i1 false)
- }
-
- // CHECK: define void @_ZN22ValueInitArrayOfMemPtr1gEv
- void g() {
- // CHECK: store i32 -1,
- f(a{});
- }
}