---

yaml
---
r: 31013
b: refs/heads/incoming
c: 26ed387
h: refs/heads/master
i:
  31011: a24cfda
v: v3

Author: auREAX

[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: edc317b8212fe1c29b5e7e2e4e260b9a4d72b447
+refs/heads/incoming: 26ed387d7faec2e86289855098f08c56986e2568
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/configure

@@ -295,7 +295,7 @@ opt manage-submodules 1 "let the build manage the git submodules"
 opt mingw-cross 0 "cross-compile for win32 using mingw"
 opt clang 0 "prefer clang to gcc for building the runtime"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
-opt pax-marks 0 "apply PaX markings to rustc binaries (required for GRSecurity/PaX-patched kernels)"
+opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
 valopt prefix "/usr/local" "set installation prefix"
 valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"
@@ -344,8 +344,11 @@ probe CFG_PDFLATEX         pdflatex
 probe CFG_XETEX            xetex
 probe CFG_LUATEX           luatex
 probe CFG_NODE             nodejs node
-probe CFG_PAXCTL           paxctl /sbin/paxctl
-probe CFG_ZCAT             zcat
+if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
+then
+    probe CFG_PAXCTL           paxctl /sbin/paxctl
+    probe CFG_ZCAT             zcat
+fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
@@ -359,19 +362,18 @@ fi
 
 if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
 then
-    if [ ! -z "$CFG_ENABLE_PAX_MARKS" -a -z "$CFG_PAXCTL" ]
+    if [ ! -z "$CFG_ENABLE_PAX_FLAGS" -a -z "$CFG_PAXCTL" ]
     then
         err "enabled PaX markings but no paxctl binary found"
     fi
 
-    if [ -z "$CFG_DISABLE_PAX_MARKS" ]
+    if [ -z "$CFG_DISABLE_PAX_FLAGS" ]
     then
         # GRSecurity/PaX detection. This can be very flaky.
         GRSEC_DETECTED=
 
         # /dev/grsec only exists if CONFIG_GRKERNSEC_NO_RBAC is not set.
-        # /proc is normally only available to root and users in the CONFIG_GRKERNSEC_PROC_GID group,
-        # and /proc/sys/kernel/grsecurity is not available if ÇONFIG_GRKERNSEC_SYSCTL is not set.
+        # /proc/sys/kernel/grsecurity is not available if ÇONFIG_GRKERNSEC_SYSCTL is not set.
         if [ -e /dev/grsec -o -d /proc/sys/kernel/grsecurity ]
         then
             GRSEC_DETECTED=1
@@ -393,9 +395,9 @@ then
             step_msg "GRSecurity: yes"
             if [ ! -z "$CFG_PAXCTL" ]
             then
-                CFG_ENABLE_PAX_MARKS=1
+                CFG_ENABLE_PAX_FLAGS=1
             else
-                warn "GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_MARKS"
+                warn "GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_FLAGS"
             fi
         else
             step_msg "GRSecurity: no"
@@ -748,9 +750,9 @@ putvar CFG_C_COMPILER
 putvar CFG_LIBDIR
 putvar CFG_DISABLE_MANAGE_SUBMODULES
 
-if [ ! -z "$CFG_ENABLE_PAX_MARKS" ]
+if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
 then
-    putvar CFG_ENABLE_PAX_MARKS
+    putvar CFG_ENABLE_PAX_FLAGS
     putvar CFG_PAXCTL
 fi
 

branches/incoming/mk/stage0.mk

@@ -12,8 +12,8 @@ ifdef CFG_ENABLE_LOCAL_RUST
 	$(Q)$(S)src/etc/local_stage0.sh $(CFG_HOST_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
 else 
 	$(Q)$(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
-ifdef CFG_ENABLE_PAX_MARKS
-	@$(call E, apply PaX markings: $@)
+ifdef CFG_ENABLE_PAX_FLAGS
+	@$(call E, apply PaX flags: $@)
 	@"$(CFG_PAXCTL)" -cm "$@"
 endif
 endif 

branches/incoming/mk/target.mk

@@ -29,8 +29,8 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
 		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$<
-ifdef CFG_ENABLE_PAX_MARKS
-	@$$(call E, apply PaX markings: $$@)
+ifdef CFG_ENABLE_PAX_FLAGS
+	@$$(call E, apply PaX flags: $$@)
 	@"$(CFG_PAXCTL)" -cm "$$@"
 endif
 

branches/incoming/src/cargo/cargo.rs

@@ -1889,8 +1889,7 @@ Commands:
     set-method      Change the method for a source.");
 }
 
-fn main() {
-    let argv = os::args();
+fn main(argv: ~[~str]) {
     let o = build_cargo_options(argv);
 
     if vec::len(o.free) < 2u {

branches/incoming/src/compiletest/compiletest.rs

@@ -12,8 +12,7 @@ use common::mode_pretty;
 use common::mode;
 use util::logv;
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let config = parse_config(args);
     log_config(config);
     run_tests(config);

branches/incoming/src/etc/combine-tests.py

@@ -19,6 +19,7 @@ def scrub(b):
 run_pass = os.path.join(src_dir, "src", "test", "run-pass")
 run_pass = os.path.abspath(run_pass)
 stage2_tests = []
+take_args = {}
 
 for t in os.listdir(run_pass):
     if t.endswith(".rs") and not (
@@ -29,6 +30,8 @@ def scrub(b):
                 "xfail-fast" in s or
                 "xfail-win32" in s):
             stage2_tests.append(t)
+            if "fn main(args:" in s or "fn main(++args:" in s:
+                take_args[t] = True
         f.close()
 
 stage2_tests.sort()
@@ -61,6 +64,9 @@ def scrub(b):
     p = os.path.join("test", "run-pass", t)
     p = p.replace("\\", "\\\\")
     d.write("    out.write_str(~\"run-pass [stage2]: %s\\n\");\n" % p)
-    d.write("    t_%d::main();\n" % i)
+    if t in take_args:
+        d.write("    t_%d::main(~[~\"arg0\"]);\n" % i)
+    else:
+        d.write("    t_%d::main();\n" % i)
     i += 1
 d.write("}\n")

branches/incoming/src/fuzzer/fuzzer.rs

@@ -599,8 +599,7 @@ fn check_variants(files: &[Path], cx: context) {
     }
 }
 
-fn main() {
-    let args = os::args();
+fn main(args: ~[~str]) {
     if vec::len(args) != 2u {
         error!("usage: %s <testdir>", args[0]);
         return;

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

@@ -277,8 +277,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
     }
 }
 
-fn main() {
-    let args = os::args();
+fn main(args: ~[~str]) {
     do monitor |demitter| {
         run_compiler(args, demitter);
     }

branches/incoming/src/rustc/front/test.rs

@@ -415,12 +415,34 @@ fn mk_test_wrapper(cx: test_ctxt,
 }
 
 fn mk_main(cx: test_ctxt) -> @ast::item {
+    let str_pt = path_node(~[cx.sess.ident_of(~"str")]);
+    let str_ty_inner = @{id: cx.sess.next_node_id(),
+                         node: ast::ty_path(str_pt, cx.sess.next_node_id()),
+                         span: dummy_sp()};
+    let str_ty = @{id: cx.sess.next_node_id(),
+                   node: ast::ty_uniq({ty: str_ty_inner, mutbl: ast::m_imm}),
+                   span: dummy_sp()};
+    let args_mt = {ty: str_ty, mutbl: ast::m_imm};
+    let args_ty_inner = @{id: cx.sess.next_node_id(),
+                          node: ast::ty_vec(args_mt),
+                          span: dummy_sp()};
+    let args_ty = {id: cx.sess.next_node_id(),
+                   node: ast::ty_uniq({ty: args_ty_inner, mutbl: ast::m_imm}),
+                   span: dummy_sp()};
+
+
+    let args_arg: ast::arg =
+        {mode: ast::expl(ast::by_val),
+         ty: @args_ty,
+         ident: cx.sess.ident_of(~"args"),
+         id: cx.sess.next_node_id()};
+
     let ret_ty = {id: cx.sess.next_node_id(),
                   node: ast::ty_nil,
                   span: dummy_sp()};
 
     let decl: ast::fn_decl =
-        {inputs: ~[],
+        {inputs: ~[args_arg],
          output: @ret_ty,
          cf: ast::return_val};
 
@@ -443,24 +465,16 @@ fn mk_main(cx: test_ctxt) -> @ast::item {
 }
 
 fn mk_test_main_call(cx: test_ctxt) -> @ast::expr {
-    // Call os::args to generate the vector of test_descs
-    let args_path = path_node(~[
-        cx.sess.ident_of(~"os"),
-        cx.sess.ident_of(~"args")
-    ]);
+
+    // Get the args passed to main so we can pass the to test_main
+    let args_path = path_node(~[cx.sess.ident_of(~"args")]);
 
     let args_path_expr_: ast::expr_ = ast::expr_path(args_path);
 
     let args_path_expr: ast::expr =
         {id: cx.sess.next_node_id(), callee_id: cx.sess.next_node_id(),
          node: args_path_expr_, span: dummy_sp()};
 
-    let args_call_expr_ = ast::expr_call(@args_path_expr, ~[], false);
-
-    let args_call_expr: ast::expr =
-        {id: cx.sess.next_node_id(), callee_id: cx.sess.next_node_id(),
-         node: args_call_expr_, span: dummy_sp()};
-
     // Call __test::test to generate the vector of test_descs
     let test_path = path_node(~[cx.sess.ident_of(~"tests")]);
 
@@ -489,7 +503,7 @@ fn mk_test_main_call(cx: test_ctxt) -> @ast::expr {
 
     let test_main_call_expr_: ast::expr_ =
         ast::expr_call(@test_main_path_expr,
-                       ~[@args_call_expr, @test_call_expr], false);
+                       ~[@args_path_expr, @test_call_expr], false);
 
     let test_main_call_expr: ast::expr =
         {id: cx.sess.next_node_id(), callee_id: cx.sess.next_node_id(),

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

@@ -1953,23 +1953,32 @@ fn register_fn_fuller(ccx: @crate_ctxt, sp: span, path: path,
            ast_map::path_to_str(path, ccx.sess.parse_sess.interner));
 
     let is_main = is_main_name(path) && !ccx.sess.building_library;
-    if is_main { create_main_wrapper(ccx, sp, llfn); }
+    if is_main { create_main_wrapper(ccx, sp, llfn, node_type); }
     llfn
 }
 
 // Create a _rust_main(args: ~[str]) function which will be called from the
 // runtime rust_start function
-fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef) {
+fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
+                       main_node_type: ty::t) {
 
     if ccx.main_fn != None::<ValueRef> {
         ccx.sess.span_fatal(sp, ~"multiple 'main' functions");
     }
 
-    let llfn = create_main(ccx, main_llfn);
+    let main_takes_argv =
+        // invariant!
+        match ty::get(main_node_type).sty {
+          ty::ty_fn(ref fn_ty) => fn_ty.sig.inputs.len() != 0u,
+          _ => ccx.sess.span_fatal(sp, ~"main has a non-function type")
+        };
+
+    let llfn = create_main(ccx, main_llfn, main_takes_argv);
     ccx.main_fn = Some(llfn);
     create_entry_fn(ccx, llfn);
 
-    fn create_main(ccx: @crate_ctxt, main_llfn: ValueRef) -> ValueRef {
+    fn create_main(ccx: @crate_ctxt, main_llfn: ValueRef,
+                   takes_argv: bool) -> ValueRef {
         let unit_ty = ty::mk_estr(ccx.tcx, ty::vstore_uniq);
         let vecarg_ty: ty::arg =
             {mode: ast::expl(ast::by_val),
@@ -1989,6 +1998,9 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef) {
         let lloutputarg = llvm::LLVMGetParam(llfdecl, 0 as c_uint);
         let llenvarg = llvm::LLVMGetParam(llfdecl, 1 as c_uint);
         let mut args = ~[lloutputarg, llenvarg];
+        if takes_argv {
+            args.push(llvm::LLVMGetParam(llfdecl, 2 as c_uint));
+        }
         Call(bcx, main_llfn, args);
 
         build_return(bcx);

branches/incoming/src/rustc/middle/typeck.rs

@@ -301,12 +301,14 @@ fn check_main_fn_ty(ccx: @crate_ctxt,
             }
             let mut ok = ty::type_is_nil(fn_ty.sig.output);
             let num_args = vec::len(fn_ty.sig.inputs);
-            ok &= num_args == 0u;
+            ok &= num_args == 0u || num_args == 1u &&
+                arg_is_argv_ty(tcx, fn_ty.sig.inputs[0]);
             if !ok {
                 tcx.sess.span_err(
                     main_span,
                     fmt!("Wrong type in main function: found `%s`, \
-                          expected `fn() -> ()`",
+                          expected `extern fn(++v: ~[~str]) -> ()` \
+                          or `extern fn() -> ()`",
                          ty_to_str(tcx, main_t)));
             }
         }

branches/incoming/src/rustdoc/rustdoc.rs

@@ -3,8 +3,7 @@ use doc::Item;
 use pass::Pass;
 use config::Config;
 
-fn main() {
-    let args = os::args();
+fn main(args: ~[~str]) {
 
     if args.contains(&~"-h") || args.contains(&~"--help") {
         config::usage();

branches/incoming/src/test/bench/core-map.rs

@@ -142,8 +142,7 @@ fn empty_results() -> Results {
     }
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let num_keys = {
         if args.len() == 2 {
             uint::from_str(args[1]).get()

branches/incoming/src/test/bench/core-std.rs

@@ -8,8 +8,7 @@ use std::map::{Map, HashMap};
 
 use io::{Reader, ReaderUtil};
 
-fn main() {
-    let argv = os::args();
+fn main(++argv: ~[~str]) {
     #macro[
         [#bench[id],
          maybe_run_test(argv, #stringify(id), id)

branches/incoming/src/test/bench/core-uint-to-str.rs

@@ -1,5 +1,4 @@
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"10000000"]
     } else if args.len() <= 1u {

branches/incoming/src/test/bench/core-vec-append.rs

@@ -20,8 +20,7 @@ fn collect_dvec(num: uint) -> ~[uint] {
     return dvec::unwrap(move result);
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"50000000"]
     } else if args.len() <= 1u {

branches/incoming/src/test/bench/graph500-bfs.rs

@@ -384,8 +384,7 @@ fn validate(edges: ~[(node_id, node_id)],
     true
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"15", ~"48"]
     } else if args.len() <= 1u {

branches/incoming/src/test/bench/msgsend-pipes-shared.rs

@@ -90,8 +90,7 @@ fn run(args: &[~str]) {
     assert result == num_bytes * size;
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"1000000", ~"10000"]
     } else if args.len() <= 1u {

branches/incoming/src/test/bench/msgsend-pipes.rs

@@ -87,8 +87,7 @@ fn run(args: &[~str]) {
     assert result == num_bytes * size;
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"1000000", ~"8"]
     } else if args.len() <= 1u {

branches/incoming/src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -56,8 +56,7 @@ fn thread_ring(i: uint,
     };
 }
 
-fn main() {
-    let args = os::args();
+fn main(++args: ~[~str]) {
     let args = if os::getenv(~"RUST_BENCH").is_some() {
         ~[~"", ~"100", ~"10000"]
     } else if args.len() <= 1u {