---

yaml
---
r: 30057
b: refs/heads/incoming
c: 7706262
h: refs/heads/master
i:
  30055: fe7d276
v: v3

Author: Elliott Slaughter

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 30768d3609d905439a129e7e9bf4571b38e321f3
+refs/heads/incoming: 7706262a730ac7bbea73decc551cdafffa8f1dbd
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/driver/driver.rs

@@ -421,6 +421,7 @@ fn build_session_options(matches: getopts::matches,
         session::unknown_crate
     };
     let static = opt_present(matches, ~"static");
+    let gc = opt_present(matches, ~"gc");
 
     let parse_only = opt_present(matches, ~"parse-only");
     let no_trans = opt_present(matches, ~"no-trans");
@@ -519,6 +520,7 @@ fn build_session_options(matches: getopts::matches,
     let sopts: @session::options =
         @{crate_type: crate_type,
           static: static,
+          gc: gc,
           optimize: opt_level,
           debuginfo: debuginfo,
           extra_debuginfo: extra_debuginfo,

branches/incoming/src/rustc/driver/session.rs

@@ -82,6 +82,7 @@ type options =
     // with additional crate configurations during the compile process
     {crate_type: crate_type,
      static: bool,
+     gc: bool,
      optimize: OptLevel,
      debuginfo: bool,
      extra_debuginfo: bool,
@@ -221,6 +222,7 @@ fn basic_options() -> @options {
     @{
         crate_type: session::lib_crate,
         static: false,
+        gc: false,
         optimize: No,
         debuginfo: false,
         extra_debuginfo: false,

branches/incoming/src/rustc/middle/trans/base.rs

@@ -4792,6 +4792,13 @@ fn trans_closure(ccx: @crate_ctxt, path: path, decl: ast::fn_decl,
                                   some(body.span));
     create_llargs_for_fn_args(fcx, ty_self, decl.inputs);
 
+    // Set GC for function.
+    if ccx.sess.opts.gc {
+        do str::as_c_str("generic") |strategy| {
+            llvm::LLVMSetGC(fcx.llfn, strategy);
+        }
+    }
+
     // Create the first basic block in the function and keep a handle on it to
     //  pass to finish_fn later.
     let bcx_top = top_scope_block(fcx, body.info());