From e08fdb0f2fcb4cabb430b0512331bb781b4ea653 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:04:32 +1100
Subject: [PATCH] coverage: Remove useless constants
---
compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs | 8 ++++----
compiler/rustc_middle/src/mir/coverage.rs | 8 --------
compiler/rustc_mir_transform/src/coverage/query.rs | 2 +-
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
index 68c1770c1d4..140566e8da9 100644
--- a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
+++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
@@ -24,8 +24,6 @@ pub(crate) mod ffi;
pub(crate) mod map_data;
pub mod mapgen;
-const VAR_ALIGN: Align = Align::EIGHT;
-
/// A context object for maintaining all state needed by the coverageinfo module.
pub struct CrateCoverageContext<'ll, 'tcx> {
/// Coverage data for each instrumented function identified by DefId.
@@ -226,7 +224,8 @@ pub(crate) fn save_cov_data_to_mod<'ll, 'tcx>(
llvm::set_global_constant(llglobal, true);
llvm::set_linkage(llglobal, llvm::Linkage::PrivateLinkage);
llvm::set_section(llglobal, &covmap_section_name);
- llvm::set_alignment(llglobal, VAR_ALIGN);
+ // LLVM's coverage mapping format specifies 8-byte alignment for items in this section.
+ llvm::set_alignment(llglobal, Align::EIGHT);
cx.add_used_global(llglobal);
}
@@ -256,7 +255,8 @@ pub(crate) fn save_func_record_to_mod<'ll, 'tcx>(
llvm::set_linkage(llglobal, llvm::Linkage::LinkOnceODRLinkage);
llvm::set_visibility(llglobal, llvm::Visibility::Hidden);
llvm::set_section(llglobal, covfun_section_name);
- llvm::set_alignment(llglobal, VAR_ALIGN);
+ // LLVM's coverage mapping format specifies 8-byte alignment for items in this section.
+ llvm::set_alignment(llglobal, Align::EIGHT);
llvm::set_comdat(cx.llmod, llglobal, &func_record_var_name);
cx.add_used_global(llglobal);
}
diff --git a/compiler/rustc_middle/src/mir/coverage.rs b/compiler/rustc_middle/src/mir/coverage.rs
index 0c91dc6d3c6..582a1806688 100644
--- a/compiler/rustc_middle/src/mir/coverage.rs
+++ b/compiler/rustc_middle/src/mir/coverage.rs
@@ -33,10 +33,6 @@ rustc_index::newtype_index! {
pub struct CounterId {}
}
-impl CounterId {
- pub const START: Self = Self::ZERO;
-}
-
rustc_index::newtype_index! {
/// ID of a coverage-counter expression. Values ascend from 0.
///
@@ -55,10 +51,6 @@ rustc_index::newtype_index! {
pub struct ExpressionId {}
}
-impl ExpressionId {
- pub const START: Self = Self::ZERO;
-}
-
/// Enum that can hold a constant zero value, the ID of an physical coverage
/// counter, or the ID of a coverage-counter expression.
///
diff --git a/compiler/rustc_mir_transform/src/coverage/query.rs b/compiler/rustc_mir_transform/src/coverage/query.rs
index b5dd9dcc7b4..65715253647 100644
--- a/compiler/rustc_mir_transform/src/coverage/query.rs
+++ b/compiler/rustc_mir_transform/src/coverage/query.rs
@@ -59,7 +59,7 @@ fn coverage_ids_info<'tcx>(
_ => None,
})
.max()
- .unwrap_or(CounterId::START);
+ .unwrap_or(CounterId::ZERO);
CoverageIdsInfo { max_counter_id }
}