diff options
| -rw-r--r-- | CodeGen/CodeGenModule.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGen/globalinit.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp index 2ce7f4e837..a5f7df18d4 100644 --- a/CodeGen/CodeGenModule.cpp +++ b/CodeGen/CodeGenModule.cpp @@ -404,7 +404,14 @@ static llvm::Constant *GenerateConstantExpr(const Expr *Expression, llvm::Constant *Idx0 = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0); llvm::Constant *Ops[] = {Idx0, Idx0}; - return llvm::ConstantExpr::getGetElementPtr(C, Ops, 2); + C = llvm::ConstantExpr::getGetElementPtr(C, Ops, 2); + + // The resultant pointer type can be implicitly casted to other pointer + // types as well, for example void*. + const llvm::Type *DestPTy = Types.ConvertType(type); + assert(isa<llvm::PointerType>(DestPTy) && + "Only expect implicit cast to pointer"); + return llvm::ConstantExpr::getBitCast(C, DestPTy); } // If this is an implicit cast of a string literal to an array type, this diff --git a/test/CodeGen/globalinit.c b/test/CodeGen/globalinit.c index 55298bc07e..f47fd5c457 100644 --- a/test/CodeGen/globalinit.c +++ b/test/CodeGen/globalinit.c @@ -10,7 +10,7 @@ void bar() { x[0] = 1; } extern int y[]; -//void *g = y; +void *g = y; int latin_ptr2len (char *p); int (*mb_ptr2len) (char *p) = latin_ptr2len; |