---

yaml
---
r: 5647
b: refs/heads/master
c: e9287e5
h: refs/heads/master
i:
  5645: 54ecf7a
  5643: 7fc1726
  5639: 0be7be8
  5631: d667f7e
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f525f6e94ceba86766eb8260abfe2dc1acc43702
+refs/heads/master: e9287e55cc6f95354632be646be18b92af2f9a08

trunk/src/comp/driver/rustc.rs

@@ -263,6 +263,7 @@ options:
     --no-typestate     don't run the typestate pass (unsafe!)
     --test             build test harness
     --gc               garbage collect shared data (experimental/temporary)
+    --stack-growth     perform stack checks (experimental)
 
 ");
 }
@@ -386,6 +387,7 @@ fn build_session_options(binary: str, match: getopts::match)
     let cfg = parse_cfgspecs(getopts::opt_strs(match, "cfg"));
     let test = opt_present(match, "test");
     let do_gc = opt_present(match, "gc");
+    let stack_growth = opt_present(match, "stack-growth");
     let sopts: @session::options =
         @{library: library,
           static: static,
@@ -405,7 +407,8 @@ fn build_session_options(binary: str, match: getopts::match)
           test: test,
           parse_only: parse_only,
           no_trans: no_trans,
-          do_gc: do_gc};
+          do_gc: do_gc,
+          stack_growth: stack_growth};
     ret sopts;
 }
 
@@ -439,7 +442,8 @@ fn opts() -> [getopts::opt] {
          optflag("time-passes"), optflag("time-llvm-passes"),
          optflag("no-typestate"), optflag("noverify"),
          optmulti("cfg"), optflag("test"),
-         optflag("lib"), optflag("static"), optflag("gc")];
+         optflag("lib"), optflag("static"), optflag("gc"),
+         optflag("stack-growth")];
 }
 
 fn main(args: [str]) {

trunk/src/comp/driver/session.rs

@@ -39,7 +39,8 @@ type options =
      test: bool,
      parse_only: bool,
      no_trans: bool,
-     do_gc: bool};
+     do_gc: bool,
+     stack_growth: bool};
 
 type crate_metadata = {name: str, data: [u8]};
 

trunk/src/comp/lib/llvm.rs

@@ -455,9 +455,9 @@ native "cdecl" mod llvm = "rustllvm" {
     fn LLVMSetFunctionCallConv(Fn: ValueRef, CC: uint);
     fn LLVMGetGC(Fn: ValueRef) -> sbuf;
     fn LLVMSetGC(Fn: ValueRef, Name: sbuf);
-    fn LLVMAddFunctionAttr(Fn: ValueRef, PA: Attribute);
+    fn LLVMAddFunctionAttr(Fn: ValueRef, PA: Attribute, HighPA: uint);
     fn LLVMGetFunctionAttr(Fn: ValueRef) -> Attribute;
-    fn LLVMRemoveFunctionAttr(Fn: ValueRef, PA: Attribute);
+    fn LLVMRemoveFunctionAttr(Fn: ValueRef, PA: Attribute, HighPA: uint);
 
     /* Operations on parameters */
     fn LLVMCountParams(Fn: ValueRef) -> uint;

trunk/src/comp/middle/trans.rs

@@ -1087,21 +1087,29 @@ fn get_static_tydesc(cx: @block_ctxt, orig_t: ty::t, ty_params: [uint],
 fn set_no_inline(f: ValueRef) {
     llvm::LLVMAddFunctionAttr(f,
                               lib::llvm::LLVMNoInlineAttribute as
-                                  lib::llvm::llvm::Attribute);
+                                  lib::llvm::llvm::Attribute,
+                              0u);
 }
 
 // Tell LLVM to emit the information necessary to unwind the stack for the
 // function f.
 fn set_uwtable(f: ValueRef) {
     llvm::LLVMAddFunctionAttr(f,
                               lib::llvm::LLVMUWTableAttribute as
-                                  lib::llvm::llvm::Attribute);
+                                  lib::llvm::llvm::Attribute,
+                              0u);
 }
 
 fn set_always_inline(f: ValueRef) {
     llvm::LLVMAddFunctionAttr(f,
                               lib::llvm::LLVMAlwaysInlineAttribute as
-                                  lib::llvm::llvm::Attribute);
+                                  lib::llvm::llvm::Attribute,
+                              0u);
+}
+
+fn set_custom_stack_growth_fn(f: ValueRef) {
+    // TODO: Remove this hack to work around the lack of u64 in the FFI.
+    llvm::LLVMAddFunctionAttr(f, 0 as lib::llvm::llvm::Attribute, 1u);
 }
 
 fn set_glue_inlining(cx: @local_ctxt, f: ValueRef, t: ty::t) {