Skip to content

Commit a897cc0

Browse files
committed
Remove unused OutputType::ThinLinkBitcode
1 parent da50297 commit a897cc0

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

Diff for: compiler/rustc_codegen_cranelift/src/driver/aot.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ fn produce_final_output_artifacts(
210210
// to get rid of it.
211211
for output_type in crate_output.outputs.keys() {
212212
match *output_type {
213-
OutputType::Bitcode | OutputType::ThinLinkBitcode | OutputType::ThinBitcode => {
213+
OutputType::Bitcode | OutputType::ThinLinkBitcode => {
214214
// Cranelift doesn't have bitcode
215215
// user_wants_bitcode = true;
216216
// // Copy to .bc, but always keep the .0.bc. There is a later

Diff for: compiler/rustc_codegen_ssa/src/back/write.rs

-3
Original file line numberDiff line numberDiff line change
@@ -630,9 +630,6 @@ fn produce_final_output_artifacts(
630630
// them for making an rlib.
631631
copy_if_one_unit(OutputType::Bitcode, true);
632632
}
633-
OutputType::ThinBitcode => {
634-
copy_if_one_unit(OutputType::ThinBitcode, true);
635-
}
636633
OutputType::ThinLinkBitcode => {
637634
copy_if_one_unit(OutputType::ThinLinkBitcode, false);
638635
}

Diff for: compiler/rustc_session/src/config.rs

+1-12
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,6 @@ pub enum OutputType {
544544
Bitcode,
545545
/// This is the summary or index data part of the ThinLTO bitcode.
546546
ThinLinkBitcode,
547-
/// This is ThinLTO's pre-link bitcode, primarily used for embedding bitcode in object files.
548-
/// This can also be used for FatLTO.
549-
ThinBitcode,
550547
Assembly,
551548
LlvmAssembly,
552549
Mir,
@@ -577,7 +574,6 @@ impl OutputType {
577574
OutputType::Exe | OutputType::DepInfo | OutputType::Metadata => true,
578575
OutputType::Bitcode
579576
| OutputType::ThinLinkBitcode
580-
| OutputType::ThinBitcode
581577
| OutputType::Assembly
582578
| OutputType::LlvmAssembly
583579
| OutputType::Mir
@@ -589,7 +585,6 @@ impl OutputType {
589585
match *self {
590586
OutputType::Bitcode => "llvm-bc",
591587
OutputType::ThinLinkBitcode => "thin-link-bitcode",
592-
OutputType::ThinBitcode => "thin-llvm-bc",
593588
OutputType::Assembly => "asm",
594589
OutputType::LlvmAssembly => "llvm-ir",
595590
OutputType::Mir => "mir",
@@ -607,7 +602,6 @@ impl OutputType {
607602
"mir" => OutputType::Mir,
608603
"llvm-bc" => OutputType::Bitcode,
609604
"thin-link-bitcode" => OutputType::ThinLinkBitcode,
610-
"thin-llvm-bc" => OutputType::ThinBitcode,
611605
"obj" => OutputType::Object,
612606
"metadata" => OutputType::Metadata,
613607
"link" => OutputType::Exe,
@@ -618,10 +612,9 @@ impl OutputType {
618612

619613
fn shorthands_display() -> String {
620614
format!(
621-
"`{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`",
615+
"`{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`, `{}`",
622616
OutputType::Bitcode.shorthand(),
623617
OutputType::ThinLinkBitcode.shorthand(),
624-
OutputType::ThinBitcode.shorthand(),
625618
OutputType::Assembly.shorthand(),
626619
OutputType::LlvmAssembly.shorthand(),
627620
OutputType::Mir.shorthand(),
@@ -636,7 +629,6 @@ impl OutputType {
636629
match *self {
637630
OutputType::Bitcode => "bc",
638631
OutputType::ThinLinkBitcode => "indexing.o",
639-
OutputType::ThinBitcode => "thin.bc",
640632
OutputType::Assembly => "s",
641633
OutputType::LlvmAssembly => "ll",
642634
OutputType::Mir => "mir",
@@ -655,7 +647,6 @@ impl OutputType {
655647
| OutputType::DepInfo => true,
656648
OutputType::Bitcode
657649
| OutputType::ThinLinkBitcode
658-
| OutputType::ThinBitcode
659650
| OutputType::Object
660651
| OutputType::Metadata
661652
| OutputType::Exe => false,
@@ -743,7 +734,6 @@ impl OutputTypes {
743734
self.0.keys().any(|k| match *k {
744735
OutputType::Bitcode
745736
| OutputType::ThinLinkBitcode
746-
| OutputType::ThinBitcode
747737
| OutputType::Assembly
748738
| OutputType::LlvmAssembly
749739
| OutputType::Mir
@@ -758,7 +748,6 @@ impl OutputTypes {
758748
self.0.keys().any(|k| match *k {
759749
OutputType::Bitcode
760750
| OutputType::ThinLinkBitcode
761-
| OutputType::ThinBitcode
762751
| OutputType::Assembly
763752
| OutputType::LlvmAssembly
764753
| OutputType::Mir

0 commit comments

Comments
 (0)