---

yaml
---
r: 63434
b: refs/heads/snap-stage3
c: 1079e41
h: refs/heads/master
v: v3

Author: vadimcn

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6cc318978796ca67e9350561601dee9931c1da12
+refs/heads/snap-stage3: 1079e41143e2f94fc0f969b967aaf89b2f4448a2
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/lib/llvm.rs

@@ -966,6 +966,12 @@ pub mod llvm {
                                                  -> BasicBlockRef;
         #[fast_ffi]
         pub unsafe fn LLVMDeleteBasicBlock(BB: BasicBlockRef);
+        
+        #[fast_ffi]
+        pub unsafe fn LLVMMoveBasicBlockAfter(BB: BasicBlockRef, MoveAfter: BasicBlockRef);
+        
+        #[fast_ffi]
+        pub unsafe fn LLVMMoveBasicBlockBefore(BB: BasicBlockRef, MoveBefore: BasicBlockRef);
 
         /* Operations on instructions */
         #[fast_ffi]

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -1907,6 +1907,8 @@ pub fn trans_closure(ccx: @mut CrateContext,
 
     finish(bcx);
     cleanup_and_Br(bcx, bcx_top, fcx.llreturn);
+    
+    unsafe { llvm::LLVMMoveBasicBlockAfter(fcx.llreturn, bcx.llbb); }
 
     // Insert the mandatory first few basic blocks before lltop.
     finish_fn(fcx, lltop);