add support for implicit cast from array to pointer that is not the element
type.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44809 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp
index 2ce7f4e..a5f7df1 100644
--- a/CodeGen/CodeGenModule.cpp
+++ b/CodeGen/CodeGenModule.cpp
@@ -404,7 +404,14 @@
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 55298bc..f47fd5c 100644
--- a/test/CodeGen/globalinit.c
+++ b/test/CodeGen/globalinit.c
@@ -10,7 +10,7 @@
extern int y[];
-//void *g = y;
+void *g = y;
int latin_ptr2len (char *p);
int (*mb_ptr2len) (char *p) = latin_ptr2len;