---

yaml
---
r: 4728
b: refs/heads/master
c: 2716938
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3db300b06e11b3dee9d6f1780f3c7b9ccad575aa
+refs/heads/master: 27169387fe615269fa79d0d904d96be0226d628a

trunk/src/comp/driver/rustc.rs

@@ -278,7 +278,6 @@ options:
     --sysroot <path>   override the system root (default: rustc's directory)
     --no-typestate     don't run the typestate pass (unsafe!)
     --test             build test harness
-    --dps              translate via destination-passing style (experimental)
     --gc               garbage collect shared data (experimental/temporary)
 
 ");
@@ -384,7 +383,6 @@ fn build_session_options(binary: str, match: getopts::match, binary_dir: str)
         };
     let cfg = parse_cfgspecs(getopts::opt_strs(match, "cfg"));
     let test = opt_present(match, "test");
-    let dps = opt_present(match, "dps");
     let do_gc = opt_present(match, "gc");
     let sopts: @session::options =
         @{library: library,
@@ -402,7 +400,6 @@ fn build_session_options(binary: str, match: getopts::match, binary_dir: str)
           sysroot: sysroot,
           cfg: cfg,
           test: test,
-          dps: dps,
           parse_only: parse_only,
           no_trans: no_trans,
           do_gc: do_gc};
@@ -437,7 +434,7 @@ fn opts() -> [getopts::opt] {
           optopt("sysroot"), optflag("stats"), optflag("time-passes"),
           optflag("time-llvm-passes"), optflag("no-typestate"),
           optflag("noverify"), optmulti("cfg"), optflag("test"),
-          optflag("lib"), optflag("static"), optflag("dps"), optflag("gc")];
+          optflag("lib"), optflag("static"), optflag("gc")];
 }
 
 fn main(args: vec[str]) {

trunk/src/comp/driver/session.rs

@@ -41,7 +41,6 @@ type options =
      sysroot: str,
      cfg: ast::crate_cfg,
      test: bool,
-     dps: bool,
      parse_only: bool,
      no_trans: bool,
      do_gc: bool

trunk/src/comp/middle/trans.rs

@@ -6021,23 +6021,17 @@ fn trans_closure(bcx_maybe: &option::t[@block_ctxt],
     let lltop = bcx.llbb;
     let block_ty = node_id_type(cx.ccx, f.body.node.id);
 
-    if cx.ccx.sess.get_opts().dps {
-        // Call into the new destination-passing-style translation engine.
-        let dest = trans_dps::dest_move(cx.ccx.tcx, fcx.llretptr, block_ty);
-        bcx = trans_dps::trans_block(bcx, dest, f.body);
-    } else {
-        // This call to trans_block is the place where we bridge between
-        // translation calls that don't have a return value (trans_crate,
-        // trans_mod, trans_item, trans_obj, et cetera) and those that do
-        // (trans_block, trans_expr, et cetera).
-        let rslt =
-            if !ty::type_is_nil(cx.ccx.tcx, block_ty) &&
-               !ty::type_is_bot(cx.ccx.tcx, block_ty) &&
-               f.proto != ast::proto_iter {
-                trans_block(bcx, f.body, save_in(fcx.llretptr))
-            } else { trans_block(bcx, f.body, return) };
-        bcx = rslt.bcx;
-    }
+    // This call to trans_block is the place where we bridge between
+    // translation calls that don't have a return value (trans_crate,
+    // trans_mod, trans_item, trans_obj, et cetera) and those that do
+    // (trans_block, trans_expr, et cetera).
+    let rslt =
+        if !ty::type_is_nil(cx.ccx.tcx, block_ty) &&
+           !ty::type_is_bot(cx.ccx.tcx, block_ty) &&
+           f.proto != ast::proto_iter {
+        trans_block(bcx, f.body, save_in(fcx.llretptr))
+    } else { trans_block(bcx, f.body, return) };
+    bcx = rslt.bcx;
 
     if !is_terminated(bcx) {
         // FIXME: until LLVM has a unit type, we are moving around