diff options
| author | bors <bors@rust-lang.org> | 2022-12-23 02:44:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-23 02:44:32 +0000 |
| commit | 5e656baf8bc832d3b77a1e49373352b3b2685fc0 (patch) | |
| tree | 41c3fe35f7c61e7ad001a48f67d3b57df7d7d9d5 /compiler/rustc_codegen_llvm/src | |
| parent | daccb3d974ca20d78e02c9691fb3bddc90194935 (diff) | |
| parent | fa1e34fbaf5a21d6ddc677c280ff8510b471bb96 (diff) | |
| download | rust-5e656baf8bc832d3b77a1e49373352b3b2685fc0.tar.gz rust-5e656baf8bc832d3b77a1e49373352b3b2685fc0.zip | |
Auto merge of #106070 - matthiaskrgr:rollup-jv9ctkl, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #105978 (Mark `proc_macro_decls_static` as always used) - #106051 (Allow building std with cranelift) - #106056 (Make `sess.bug` much less noisy) - #106057 (Give a more helpful error for "trimmed_def_paths constructed") - #106058 (Fix the issue number in comment for as_local_call_operand) - #106059 (Avoid running the `Profile` step twice on `x setup`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/intrinsic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs index 907517bf6ce..1ce48f82e1c 100644 --- a/compiler/rustc_codegen_llvm/src/intrinsic.rs +++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs @@ -567,7 +567,7 @@ fn codegen_msvc_try<'ll>( // module. // // When modifying, make sure that the type_name string exactly matches - // the one used in src/libpanic_unwind/seh.rs. + // the one used in library/panic_unwind/src/seh.rs. let type_info_vtable = bx.declare_global("??_7type_info@@6B@", bx.type_i8p()); let type_name = bx.const_bytes(b"rust_panic\0"); let type_info = |