Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1c9837d

Browse files
committedJan 24, 2025·
Auto merge of rust-lang#135947 - matthiaskrgr:rollup-k9jpfls, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#135073 (Implement `ByteStr` and `ByteString` types) - rust-lang#135492 (Add missing check for async body when suggesting await on futures.) - rust-lang#135766 (handle global trait bounds defining assoc types) - rust-lang#135880 (Get rid of RunCompiler) - rust-lang#135908 (rustc_codegen_llvm: remove outdated asm-to-obj codegen note) - rust-lang#135911 (Allow `arena_cache` queries to return `Option<&'tcx T>`) - rust-lang#135920 (simplify parse_format::Parser::ws by using next_if) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 22a220a + 7d26006 commit 1c9837d

File tree

42 files changed

+1609
-251
lines changed

Some content is hidden

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

42 files changed

+1609
-251
lines changed
 

‎Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4260,7 +4260,6 @@ dependencies = [
42604260
"rustc_serialize",
42614261
"rustc_type_ir",
42624262
"rustc_type_ir_macros",
4263-
"smallvec",
42644263
"tracing",
42654264
]
42664265

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -769,12 +769,9 @@ pub(crate) unsafe fn codegen(
769769
}
770770
}
771771

772-
// Two things to note:
773-
// - If object files are just LLVM bitcode we write bitcode, copy it to
774-
// the .o file, and delete the bitcode if it wasn't otherwise
775-
// requested.
776-
// - If we don't have the integrated assembler then we need to emit
777-
// asm from LLVM and use `gcc` to create the object file.
772+
// Note that if object files are just LLVM bitcode we write bitcode,
773+
// copy it to the .o file, and delete the bitcode if it wasn't
774+
// otherwise requested.
778775

779776
let bc_out = cgcx.output_filenames.temp_path(OutputType::Bitcode, module_name);
780777
let bc_summary_out =

0 commit comments

Comments
 (0)
This repository has been archived.