Commit c6da9ec0 authored by Matt Arsenault's avatar Matt Arsenault Committed by Matt Arsenault
Browse files

clang: Fix assert on void pointer arithmetic with address_space 

This attempted to always use the default address space void pointer
type instead of preserving the source address space.
parent 3479fd25

clang/lib/CodeGen/CGExprScalar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3258,7 +3258,7 @@ static Value *emitPointerArithmetic(CodeGenFunction &CGF, 
  // GNU void* casts amount to no-ops since our void* type is i8*, but this is

  // future proof.

  if (elementType->isVoidType() || elementType->isFunctionType()) {

    Value *result = CGF.Builder.CreateBitCast(pointer, CGF.VoidPtrTy);

    Value *result = CGF.EmitCastToVoidPtr(pointer);

    result = CGF.Builder.CreateGEP(result, index, "add.ptr");

    return CGF.Builder.CreateBitCast(result, pointer->getType());

  }

clang/test/CodeGen/address-space.c

+18 −4
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -triple x86_64-apple-darwin -emit-llvm < %s | FileCheck -check-prefixes=CHECK,X86 %s

// RUN: %clang_cc1 -triple amdgcn -emit-llvm < %s | FileCheck -check-prefixes=CHECK,AMDGCN %s

// RUN: %clang_cc1 -triple x86_64-apple-darwin -emit-llvm < %s | FileCheck -enable-var-scope -check-prefixes=CHECK,X86 %s

// RUN: %clang_cc1 -triple amdgcn -emit-llvm < %s | FileCheck -enable-var-scope -check-prefixes=CHECK,AMDGCN %s



// CHECK: @foo = common addrspace(1) global

int foo __attribute__((address_space(1)));
@@ -45,3 +45,17 @@ void test4(MyStruct __attribute__((address_space(2))) *pPtr) { 
  MyStruct s = pPtr[0];

  pPtr[0] = s;

}



// Make sure the right address space is used when doing arithmetic on a void

// pointer. Make sure no invalid bitcast is introduced.



// CHECK-LABEL: @void_ptr_arithmetic_test(

// X86: [[ALLOCA:%.*]] = alloca i8 addrspace(1)*

// X86-NEXT: store i8 addrspace(1)* %arg, i8 addrspace(1)** [[ALLOCA]]

// X86-NEXT: load i8 addrspace(1)*, i8 addrspace(1)** [[ALLOCA]]

// X86-NEXT: getelementptr i8, i8 addrspace(1)*

// X86-NEXT: ret i8 addrspace(1)*

void __attribute__((address_space(1)))*

void_ptr_arithmetic_test(void __attribute__((address_space(1))) *arg) {

    return arg + 4;

}