---

yaml
---
r: 22668
b: refs/heads/master
c: 7680f50
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: df4db83ed840b042942a26ed34f126d9829fcd11
+refs/heads/master: 7680f504c2c9934a617ff20b1d852ea191c6bc52
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/driver/session.rs

@@ -39,6 +39,7 @@ const coherence: uint = 512u;
 const borrowck_stats: uint = 1024u;
 const borrowck_note_pure: uint = 2048;
 const borrowck_note_loan: uint = 4096;
+const no_landing_pads: uint = 8192;
 
 fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
     ~[(~"ppregions", ~"prettyprint regions with \
@@ -58,7 +59,9 @@ fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
      (~"borrowck-note-pure", ~"note where purity is req'd",
       borrowck_note_pure),
      (~"borrowck-note-loan", ~"note where loans are req'd",
-      borrowck_note_loan)
+      borrowck_note_loan),
+     (~"no-landing-pads", ~"omit landing pads for unwinding",
+      no_landing_pads)
     ]
 }
 

trunk/src/rustc/middle/trans/base.rs

@@ -3224,6 +3224,10 @@ fn invoke(bcx: block, llfn: ValueRef, llargs: ~[ValueRef]) -> block {
 }
 
 fn need_invoke(bcx: block) -> bool {
+    if (bcx.ccx().sess.opts.debugging_opts & session::no_landing_pads != 0) {
+        ret false;
+    }
+
     if have_cached_lpad(bcx) {
         ret true;
     }