Skip to content

Commit 57f8073

Browse files
committed
Remove obsoleted -Z options
* borrowck_note_pure - unused * borrowck_note_loan - unused * no_debug_borrows - unused * lint_llvm - equivalent to -Z no-prepopulate-passes + --llvm-passes lint
1 parent eca980b commit 57f8073

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

src/librustc/back/link.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ pub mod write {
156156
pass.with_c_str(|s| llvm::LLVMRustAddPass(fpm, s))
157157
};
158158
if !sess.no_verify() { assert!(addpass("verify")); }
159-
if sess.lint_llvm() { assert!(addpass("lint")); }
160159

161160
if !sess.no_prepopulate_passes() {
162161
llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod);

src/librustc/driver/session.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ debugging_opts!(
5959
asm_comments,
6060
no_verify,
6161
borrowck_stats,
62-
borrowck_note_pure,
63-
borrowck_note_loan,
6462
no_landing_pads,
6563
debug_llvm,
6664
count_type_sizes,
@@ -70,8 +68,6 @@ debugging_opts!(
7068
debug_info,
7169
extra_debug_info,
7270
print_link_args,
73-
no_debug_borrows,
74-
lint_llvm,
7571
print_llvm_passes,
7672
no_vectorize_loops,
7773
no_vectorize_slp,
@@ -96,10 +92,6 @@ pub fn debugging_opts_map() -> ~[(&'static str, &'static str, uint)] {
9692
("asm-comments", "generate comments into the assembly (may change behavior)", asm_comments),
9793
("no-verify", "skip LLVM verification", no_verify),
9894
("borrowck-stats", "gather borrowck statistics", borrowck_stats),
99-
("borrowck-note-pure", "note where purity is req'd",
100-
borrowck_note_pure),
101-
("borrowck-note-loan", "note where loans are req'd",
102-
borrowck_note_loan),
10395
("no-landing-pads", "omit landing pads for unwinding",
10496
no_landing_pads),
10597
("debug-llvm", "enable debug output from LLVM", debug_llvm),
@@ -112,12 +104,6 @@ pub fn debugging_opts_map() -> ~[(&'static str, &'static str, uint)] {
112104
("extra-debug-info", "Extra debugging info (experimental)",
113105
extra_debug_info),
114106
("debug-info", "Produce debug info (experimental)", debug_info),
115-
("no-debug-borrows",
116-
"do not show where borrow checks fail",
117-
no_debug_borrows),
118-
("lint-llvm",
119-
"Run the LLVM lint pass on the pre-optimization IR",
120-
lint_llvm),
121107
("print-llvm-passes",
122108
"Prints the llvm optimization passes being run",
123109
print_llvm_passes),
@@ -329,17 +315,7 @@ impl Session_ {
329315
pub fn meta_stats(&self) -> bool { self.debugging_opt(meta_stats) }
330316
pub fn asm_comments(&self) -> bool { self.debugging_opt(asm_comments) }
331317
pub fn no_verify(&self) -> bool { self.debugging_opt(no_verify) }
332-
pub fn lint_llvm(&self) -> bool { self.debugging_opt(lint_llvm) }
333318
pub fn borrowck_stats(&self) -> bool { self.debugging_opt(borrowck_stats) }
334-
pub fn borrowck_note_pure(&self) -> bool {
335-
self.debugging_opt(borrowck_note_pure)
336-
}
337-
pub fn borrowck_note_loan(&self) -> bool {
338-
self.debugging_opt(borrowck_note_loan)
339-
}
340-
pub fn debug_borrows(&self) -> bool {
341-
self.opts.optimize == No && !self.debugging_opt(no_debug_borrows)
342-
}
343319
pub fn print_llvm_passes(&self) -> bool {
344320
self.debugging_opt(print_llvm_passes)
345321
}

0 commit comments

Comments
 (0)