From 3f5e0b8114e8f446b42d5102805494801af38ecb Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 26 Feb 2010 18:23:13 +0000 Subject: [PATCH] fix PR6435 another bug from the MallocInst elimination work. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97231 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/GlobalOpt.cpp | 4 +-- .../GlobalOpt/2010-02-26-MallocSROA.ll | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 6cd2c086a41..73a5504a314 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -1297,9 +1297,7 @@ static GlobalVariable *PerformHeapAllocSRoA(GlobalVariable *GV, CallInst *CI, ConstantInt::get(IntPtrTy, TypeSize), NElems, CI->getName() + ".f" + Twine(FieldNo)); - CallInst *NCI = dyn_cast(NMI) ? - extractMallocCallFromBitCast(NMI) : cast(NMI); - FieldMallocs.push_back(NCI); + FieldMallocs.push_back(NMI); new StoreInst(NMI, NGV, CI); } diff --git a/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll b/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll new file mode 100644 index 00000000000..6f1996a867e --- /dev/null +++ b/test/Transforms/GlobalOpt/2010-02-26-MallocSROA.ll @@ -0,0 +1,27 @@ +; RUN: opt -globalopt -S %s +; PR6435 +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" +target triple = "x86_64-unknown-linux-gnu" + +%struct.xyz = type { double, i32 } + +@Y = internal global %struct.xyz* null ; <%struct.xyz**> [#uses=2] +@numf2s = external global i32 ; [#uses=1] + +define fastcc void @init_net() nounwind { +entry: + %0 = load i32* @numf2s, align 4 ; [#uses=1] + %mallocsize2 = shl i32 %0, 4 ; [#uses=1] + %malloccall3 = tail call i8* @malloc(i32 %mallocsize2) nounwind ; [#uses=1] + %1 = bitcast i8* %malloccall3 to %struct.xyz* ; <%struct.xyz*> [#uses=1] + store %struct.xyz* %1, %struct.xyz** @Y, align 8 + ret void +} + +define fastcc void @load_train(i8* %trainfile, i32 %mode, i32 %objects) nounwind { +entry: + %0 = load %struct.xyz** @Y, align 8 ; <%struct.xyz*> [#uses=0] + ret void +} + +declare noalias i8* @malloc(i32)