diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2008-06-01 15:31:44 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2008-06-01 15:31:44 +0000 |
| commit | 7dfa639e9274b9f40c8f207e35c0fcbfe75d04f8 (patch) | |
| tree | c41843385f28a7ce3e47bdc65d3fd2225729dbe2 | |
| parent | bfe08e093babca58d905ffe4ebbdc44647781f42 (diff) | |
Make sure _Bool globals have the correct type.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51838 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 11 | ||||
| -rw-r--r-- | test/CodeGen/bool-init.c | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index 4cb3c7bb2a..be9eaad9ac 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -793,13 +793,18 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E, CodeGenFunction *CGF) { QualType type = E->getType().getCanonicalType(); - + if (type->isIntegerType()) { llvm::APSInt Value(static_cast<uint32_t>(Context.getTypeSize(type))); if (E->isIntegerConstantExpr(Value, Context)) { return llvm::ConstantInt::get(Value); } } - - return ConstExprEmitter(*this, CGF).Visit(const_cast<Expr*>(E)); + + llvm::Constant* C = ConstExprEmitter(*this, CGF).Visit(const_cast<Expr*>(E)); + if (C->getType() == llvm::Type::Int1Ty) { + const llvm::Type *BoolTy = getTypes().ConvertTypeForMem(E->getType()); + C = llvm::ConstantExpr::getZExt(C, BoolTy); + } + return C; } diff --git a/test/CodeGen/bool-init.c b/test/CodeGen/bool-init.c new file mode 100644 index 0000000000..2e5d56a0a1 --- /dev/null +++ b/test/CodeGen/bool-init.c @@ -0,0 +1,4 @@ +// RUN: clang -emit-llvm < %s | grep i1 | count 1 + +// Check that the type of this global isn't i1 +_Bool test = &test; |