From 9effcbb879728f8a1e0e86c9cb777f11a9a3be7d Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Wed, 30 Oct 2013 22:54:58 +0000 Subject: [PATCH] Teach scalarrepl about address spaces git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193720 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Scalar/ScalarReplAggregates.cpp | 2 +- test/Transforms/ScalarRepl/union-pointer.ll | 43 ++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 33bbe151630..57b290e14b1 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -963,7 +963,7 @@ ConvertScalar_InsertValue(Value *SV, Value *Old, if (SV->getType()->isFloatingPointTy() || SV->getType()->isVectorTy()) SV = Builder.CreateBitCast(SV, IntegerType::get(SV->getContext(),SrcWidth)); else if (SV->getType()->isPointerTy()) - SV = Builder.CreatePtrToInt(SV, TD.getIntPtrType(SV->getContext())); + SV = Builder.CreatePtrToInt(SV, TD.getIntPtrType(SV->getType())); // Zero extend or truncate the value if needed. if (SV->getType() != AllocaType) { diff --git a/test/Transforms/ScalarRepl/union-pointer.ll b/test/Transforms/ScalarRepl/union-pointer.ll index 03d25ac7085..f0dc141aca8 100644 --- a/test/Transforms/ScalarRepl/union-pointer.ll +++ b/test/Transforms/ScalarRepl/union-pointer.ll @@ -1,13 +1,16 @@ ; PR892 -; RUN: opt < %s -scalarrepl -S | \ -; RUN: not grep alloca -; RUN: opt < %s -scalarrepl -S | grep "ret i8" +; RUN: opt < %s -scalarrepl -S | FileCheck %s -target datalayout = "e-p:32:32-n8:16:32" + +target datalayout = "e-p:32:32-p1:16:16-n8:16:32" target triple = "i686-apple-darwin8.7.2" - %struct.Val = type { i32*, i32 } + +%struct.Val = type { i32*, i32 } define i8* @test(i16* %X) { +; CHECK-LABEL: @test( +; CHECK-NOT: alloca +; CHECK: ret i8* %X_addr = alloca i16* ; [#uses=2] store i16* %X, i16** %X_addr %X_addr.upgrd.1 = bitcast i16** %X_addr to i8** ; [#uses=1] @@ -15,7 +18,37 @@ define i8* @test(i16* %X) { ret i8* %tmp } +define i8 addrspace(1)* @test_as1(i16 addrspace(1)* %x) { +; CHECK-LABEL: @test_as1( +; CHECK-NEXT: %1 = ptrtoint i16 addrspace(1)* %x to i16 +; CHECK-NEXT: %2 = inttoptr i16 %1 to i8 addrspace(1)* +; CHECK-NEXT: ret i8 addrspace(1)* %2 + %x_addr = alloca i16 addrspace(1)* + store i16 addrspace(1)* %x, i16 addrspace(1)** %x_addr + %x_addr.upgrd.1 = bitcast i16 addrspace(1)** %x_addr to i8 addrspace(1)** + %tmp = load i8 addrspace(1)** %x_addr.upgrd.1 + ret i8 addrspace(1)* %tmp +} + +define i8 addrspace(1)* @test_as1_array(i16 addrspace(1)* %x) { +; CHECK-LABEL: @test_as1_array( +; CHECK-NEXT: %1 = ptrtoint i16 addrspace(1)* %x to i16 +; CHECK-NEXT: %2 = inttoptr i16 %1 to i8 addrspace(1)* +; CHECK-NEXT: ret i8 addrspace(1)* %2 + %as_ptr_array = alloca [4 x i16 addrspace(1)*] + %elem1 = getelementptr [4 x i16 addrspace(1)*]* %as_ptr_array, i32 0, i32 1 + store i16 addrspace(1)* %x, i16 addrspace(1)** %elem1 + %elem1.cast = bitcast i16 addrspace(1)** %elem1 to i8 addrspace(1)** + %tmp = load i8 addrspace(1)** %elem1.cast + ret i8 addrspace(1)* %tmp +} + + define void @test2(i64 %Op.0) { +; CHECK-LABEL: @test2( +; CHECK-NOT: alloca +; CHECK: ret void + %tmp = alloca %struct.Val, align 8 ; <%struct.Val*> [#uses=3] %tmp1 = alloca %struct.Val, align 8 ; <%struct.Val*> [#uses=3] %tmp.upgrd.2 = call i64 @_Z3foov( ) ; [#uses=1] -- 2.34.1