From 10e3ef8d2df8e578d620518ee36febe5c236523a Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Thu, 17 Apr 2014 17:45:37 +0000 Subject: [PATCH] Bug 18567: Fix constantexpr pointer casts with address spaces. Getting a pointer into a struct at a non-zero offset would try to use the default address space. llvm-svn: 206478 --- clang/lib/CodeGen/CGExprConstant.cpp | 4 +++- .../address-space-constant-initializers.cl | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 clang/test/CodeGenOpenCL/address-space-constant-initializers.cl diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp index 82382ddf6888..bce0475cbc09 100644 --- a/clang/lib/CodeGen/CGExprConstant.cpp +++ b/clang/lib/CodeGen/CGExprConstant.cpp @@ -1063,7 +1063,9 @@ llvm::Constant *CodeGenModule::EmitConstantValue(const APValue &Value, // Apply offset if necessary. if (!Offset->isNullValue()) { - llvm::Constant *Casted = llvm::ConstantExpr::getBitCast(C, Int8PtrTy); + unsigned AS = C->getType()->getPointerAddressSpace(); + llvm::Type *CharPtrTy = Int8Ty->getPointerTo(AS); + llvm::Constant *Casted = llvm::ConstantExpr::getBitCast(C, CharPtrTy); Casted = llvm::ConstantExpr::getGetElementPtr(Casted, Offset); C = llvm::ConstantExpr::getPointerCast(Casted, C->getType()); } diff --git a/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl b/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl new file mode 100644 index 000000000000..ae8cedc1ca5b --- /dev/null +++ b/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl @@ -0,0 +1,20 @@ +// RUN: %clang_cc1 %s -ffake-address-space-map -emit-llvm -o - | FileCheck %s + +typedef struct { + int i; + float f; // At non-zero offset. +} ArrayStruct; + +__constant ArrayStruct constant_array_struct = { 0, 0.0f }; + +typedef struct { + __constant float* constant_float_ptr; +} ConstantArrayPointerStruct; + +// CHECK: %struct.ConstantArrayPointerStruct = type { float addrspace(3)* } +// CHECK: addrspace(3) global %struct.ConstantArrayPointerStruct { float addrspace(3)* bitcast (i8 addrspace(3)* getelementptr (i8 addrspace(3)* bitcast (%struct.ArrayStruct addrspace(3)* @constant_array_struct to i8 addrspace(3)*), i64 4) to float addrspace(3)*) } +// Bug 18567 +__constant ConstantArrayPointerStruct constant_array_pointer_struct = { + &constant_array_struct.f +}; +