[llvm-commits] [llvm] r48657 - in /llvm/trunk: lib/Transforms/Scalar/CodeGenPrepare.cpp test/CodeGen/X86/multiple-return-values-cross-block.ll

[Dan Gohman]

Author: djg
Date: Fri Mar 21 16:01:32 2008
New Revision: 48657

URL: http://llvm.org/viewvc/llvm-project?rev=48657&view=rev
Log:
Handle getresult instructions in different basic blocks
from their aggregate operands by moving the getresult
instructions.

Added:
    llvm/trunk/test/CodeGen/X86/multiple-return-values-cross-block.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp?rev=48657&r1=48656&r2=48657&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp Fri Mar 21 16:01:32 2008
@@ -1127,6 +1127,15 @@
             // Sink address computing for memory operands into the block.
             MadeChange |= OptimizeInlineAsmInst(I, &(*CI), SunkAddrs);
         }
+    } else if (GetResultInst *GRI = dyn_cast<GetResultInst>(I)) {
+      // Ensure that all getresult instructions live in the same basic block
+      // as their associated struct-value instructions. Codegen requires
+      // this, as lowering only works on one basic block at a time.
+      if (Instruction *Agg = dyn_cast<Instruction>(GRI->getAggregateValue())) {
+        BasicBlock *AggBB = Agg->getParent();
+        if (AggBB != GRI->getParent())
+          GRI->moveBefore(AggBB->getTerminator());
+      }
     }
   }
     

Added: llvm/trunk/test/CodeGen/X86/multiple-return-values-cross-block.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/multiple-return-values-cross-block.ll?rev=48657&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/multiple-return-values-cross-block.ll (added)
+++ llvm/trunk/test/CodeGen/X86/multiple-return-values-cross-block.ll Fri Mar 21 16:01:32 2008
@@ -0,0 +1,15 @@
+; RUN: llvm-as < %s | llc -march=x86
+
+declare {x86_fp80, x86_fp80} @test()
+
+define void @call2(x86_fp80 *%P1, x86_fp80 *%P2) {
+  %a = call {x86_fp80,x86_fp80} @test()
+  %b = getresult {x86_fp80,x86_fp80} %a, 1
+  store x86_fp80 %b, x86_fp80* %P1
+br label %L
+
+L:
+  %c = getresult {x86_fp80,x86_fp80} %a, 0
+  store x86_fp80 %c, x86_fp80* %P2
+  ret void
+}