diff options
| author | bors <bors@rust-lang.org> | 2022-12-25 23:47:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-25 23:47:11 +0000 |
| commit | 797b5f0f8e9ab6d02a6a1464b04dea75a7a4cde4 (patch) | |
| tree | 811ca661f067af0af334b460c71448460ccb81bf /compiler/rustc_codegen_llvm/src/back/write.rs | |
| parent | 8dfb3395411555e93399671d0c41a4ac9ed62b95 (diff) | |
| parent | a054e703b1d6335d7145c7280d63add754bb0d93 (diff) | |
| download | rust-797b5f0f8e9ab6d02a6a1464b04dea75a7a4cde4.tar.gz rust-797b5f0f8e9ab6d02a6a1464b04dea75a7a4cde4.zip | |
Auto merge of #106143 - matthiaskrgr:rollup-3kpy1dc, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #105375 (Fix an outdated comment mentioning parameter that doesn't exist anymore) - #105955 (Remove wrapper functions for some unstable options) - #106137 (fix more clippy::style findings) - #106140 (Migrate links-color.goml to functions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 97d0de47b3a..e23c88b62c1 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -203,7 +203,7 @@ pub fn target_machine_factory( sess.opts.unstable_opts.trap_unreachable.unwrap_or(sess.target.trap_unreachable); let emit_stack_size_section = sess.opts.unstable_opts.emit_stack_sizes; - let asm_comments = sess.asm_comments(); + let asm_comments = sess.opts.unstable_opts.asm_comments; let relax_elf_relocations = sess.opts.unstable_opts.relax_elf_relocations.unwrap_or(sess.target.relax_elf_relocations); |