Skip to content

Commit 53d19b3

Browse files
committedNov 24, 2020
Auto merge of #79377 - jonas-schievink:rollup-ye81i66, r=jonas-schievink
Rollup of 10 pull requests Successful merges: - #76858 (Add exploit mitigations chapter to the rustc book) - #79310 (Make `fold_item_recur` non-nullable) - #79312 (Get rid of `doctree::Impl`) - #79321 (Accept '!' in intra-doc links) - #79346 (Allow using `-Z fewer-names=no` to retain value names) - #79351 (Fix typo in `keyword` docs for traits) - #79354 (BTreeMap: cut out the ceremony around BoxedNode) - #79358 (BTreeMap/BTreeSet: make public doc more consistent) - #79367 (Allow disabling TrapUnreachable via -Ztrap-unreachable=no) - #79374 (Add note to use nightly when using expr in const generics) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6331023 + f049b0b commit 53d19b3

File tree

92 files changed

+999
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+999
-312
lines changed
 

‎compiler/rustc_codegen_llvm/src/back/write.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ pub fn target_machine_factory(
152152
let features = features.join(",");
153153
let features = CString::new(features).unwrap();
154154
let abi = SmallCStr::new(&sess.target.llvm_abiname);
155-
let trap_unreachable = sess.target.trap_unreachable;
155+
let trap_unreachable =
156+
sess.opts.debugging_opts.trap_unreachable.unwrap_or(sess.target.trap_unreachable);
156157
let emit_stack_size_section = sess.opts.debugging_opts.emit_stack_sizes;
157158

158159
let asm_comments = sess.asm_comments();

‎compiler/rustc_interface/src/tests.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ fn test_debugging_options_tracking_hash() {
547547
tracked!(debug_macros, true);
548548
tracked!(dep_info_omit_d_target, true);
549549
tracked!(dual_proc_macros, true);
550-
tracked!(fewer_names, true);
550+
tracked!(fewer_names, Some(true));
551551
tracked!(force_overflow_checks, Some(true));
552552
tracked!(force_unstable_if_unmarked, true);
553553
tracked!(fuel, Some(("abc".to_string(), 99)));
@@ -592,6 +592,7 @@ fn test_debugging_options_tracking_hash() {
592592
tracked!(thinlto, Some(true));
593593
tracked!(tune_cpu, Some(String::from("abc")));
594594
tracked!(tls_model, Some(TlsModel::GeneralDynamic));
595+
tracked!(trap_unreachable, Some(false));
595596
tracked!(treat_err_as_bug, Some(1));
596597
tracked!(unleash_the_miri_inside_of_you, true);
597598
tracked!(use_ctors_section, Some(true));

0 commit comments

Comments
 (0)