diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-05-01 22:51:49 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-05-01 22:51:49 +0000 |
| commit | 385fbc17e3d5aca3ed6423fdb4da3f65a0af3df3 (patch) | |
| tree | a7e4ebc9255cb4f0e873496b97ec196c918f5571 | |
| parent | 3ff7fb0fad8f7f56b39c6084c77117edc9121927 (diff) | |
| download | llvm-385fbc17e3d5aca3ed6423fdb4da3f65a0af3df3.tar.gz | |
Merging r155954:
------------------------------------------------------------------------
r155954 | void | 2012-05-01 15:50:45 -0700 (Tue, 01 May 2012) | 3 lines
Strip the pointer casts off of allocas so that the selection DAG can find them.
PR10799
------------------------------------------------------------------------
llvm-svn: 155955
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/GC/cg-O0.ll | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 94cb95804f69..f1e879be9567 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -5050,7 +5050,7 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) { } case Intrinsic::gcroot: if (GFI) { - const Value *Alloca = I.getArgOperand(0); + const Value *Alloca = I.getArgOperand(0)->stripPointerCasts(); const Constant *TypeMap = cast<Constant>(I.getArgOperand(1)); FrameIndexSDNode *FI = cast<FrameIndexSDNode>(getValue(Alloca).getNode()); diff --git a/llvm/test/CodeGen/X86/GC/cg-O0.ll b/llvm/test/CodeGen/X86/GC/cg-O0.ll new file mode 100644 index 000000000000..b4929425e94a --- /dev/null +++ b/llvm/test/CodeGen/X86/GC/cg-O0.ll @@ -0,0 +1,17 @@ +; RUN: llc < %s -O0 + +define i32 @main() { +entry: + call void @f() + ret i32 0 +} + +define void @f() gc "ocaml" { +entry: + %ptr.stackref = alloca i8* + %gcroot = bitcast i8** %ptr.stackref to i8** + call void @llvm.gcroot(i8** %gcroot, i8* null) + ret void +} + +declare void @llvm.gcroot(i8**, i8*) nounwind |