Fix some bugs where we would sometimes use 0, not -1, when emitting a null constant of type pointer-to-data-member.
llvm-svn: 170806
This commit is contained in:
parent
27c42e66bb
commit
789ce142df
|
@ -931,7 +931,7 @@ AggExprEmitter::EmitInitializationToLValue(Expr* E, LValue LV) {
|
|||
// 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)) {
|
||||
} else if (isa<ImplicitValueInitExpr>(E) || isa<CXXScalarValueInitExpr>(E)) {
|
||||
EmitNullInitializationToLValue(LV);
|
||||
} else if (type->isReferenceType()) {
|
||||
RValue RV = CGF.EmitReferenceBindingToExpr(E, /*InitializedDecl=*/0);
|
||||
|
@ -960,8 +960,8 @@ void AggExprEmitter::EmitNullInitializationToLValue(LValue lv) {
|
|||
return;
|
||||
|
||||
if (!CGF.hasAggregateLLVMType(type)) {
|
||||
// For non-aggregates, we can store zero.
|
||||
llvm::Value *null = llvm::Constant::getNullValue(CGF.ConvertType(type));
|
||||
// For non-aggregates, we can store the appropriate null constant.
|
||||
llvm::Value *null = CGF.CGM.EmitNullConstant(type);
|
||||
// Note that the following is not equivalent to
|
||||
// EmitStoreThroughBitfieldLValue for ARC types.
|
||||
if (lv.isBitField()) {
|
||||
|
|
|
@ -266,7 +266,7 @@ public:
|
|||
Value *VisitInitListExpr(InitListExpr *E);
|
||||
|
||||
Value *VisitImplicitValueInitExpr(const ImplicitValueInitExpr *E) {
|
||||
return CGF.CGM.EmitNullConstant(E->getType());
|
||||
return EmitNullValue(E->getType());
|
||||
}
|
||||
Value *VisitExplicitCastExpr(ExplicitCastExpr *E) {
|
||||
if (E->getType()->isVariablyModifiedType())
|
||||
|
@ -800,10 +800,7 @@ EmitComplexToScalarConversion(CodeGenFunction::ComplexPairTy Src,
|
|||
}
|
||||
|
||||
Value *ScalarExprEmitter::EmitNullValue(QualType Ty) {
|
||||
if (const MemberPointerType *MPT = Ty->getAs<MemberPointerType>())
|
||||
return CGF.CGM.getCXXABI().EmitNullMemberPointer(MPT);
|
||||
|
||||
return llvm::Constant::getNullValue(ConvertType(Ty));
|
||||
return CGF.CGM.EmitNullConstant(Ty);
|
||||
}
|
||||
|
||||
/// \brief Emit a sanitization check for the given "binary" operation (which
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
// 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() {
|
||||
|
@ -7,4 +9,42 @@ 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{});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue