bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #123439 - Zalathar:constants, r=oli-obk

Browse source 
coverage: Remove useless constants

After #122972 and #123419, these constants don't serve any useful purpose, so get rid of them.

`@rustbot` label +A-code-coverage
This commit is contained in:
Matthias Krüger 2024-04-04 14:51:18 +02:00 • committed by GitHub
commit 4ba3f46be3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
View file

@ -24,8 +24,6 @@ pub(crate) mod ffi;
pub(crate) mod map_data; pub(crate) mod map_data;
pub mod mapgen; pub mod mapgen;
const VAR_ALIGN: Align = Align::EIGHT;
/// A context object for maintaining all state needed by the coverageinfo module. /// A context object for maintaining all state needed by the coverageinfo module.
pub struct CrateCoverageContext<'ll, 'tcx> { pub struct CrateCoverageContext<'ll, 'tcx> {
/// Coverage data for each instrumented function identified by DefId. /// 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_global_constant(llglobal, true);
llvm::set_linkage(llglobal, llvm::Linkage::PrivateLinkage); llvm::set_linkage(llglobal, llvm::Linkage::PrivateLinkage);
llvm::set_section(llglobal, &covmap_section_name); 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); 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_linkage(llglobal, llvm::Linkage::LinkOnceODRLinkage);
llvm::set_visibility(llglobal, llvm::Visibility::Hidden); llvm::set_visibility(llglobal, llvm::Visibility::Hidden);
llvm::set_section(llglobal, covfun_section_name); 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); llvm::set_comdat(cx.llmod, llglobal, &func_record_var_name);
cx.add_used_global(llglobal); cx.add_used_global(llglobal);
} }

8
compiler/rustc_middle/src/mir/coverage.rs
View file

@ -33,10 +33,6 @@ rustc_index::newtype_index! {
pub struct CounterId {} pub struct CounterId {}
} }
impl CounterId {
pub const START: Self = Self::ZERO;
}
rustc_index::newtype_index! { rustc_index::newtype_index! {
/// ID of a coverage-counter expression. Values ascend from 0. /// ID of a coverage-counter expression. Values ascend from 0.
/// ///
@ -55,10 +51,6 @@ rustc_index::newtype_index! {
pub struct ExpressionId {} 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 /// Enum that can hold a constant zero value, the ID of an physical coverage
/// counter, or the ID of a coverage-counter expression. /// counter, or the ID of a coverage-counter expression.
/// ///

2
compiler/rustc_mir_transform/src/coverage/query.rs
View file

@ -59,7 +59,7 @@ fn coverage_ids_info<'tcx>(
_ => None, _ => None,
}) })
.max() .max()
.unwrap_or(CounterId::START); .unwrap_or(CounterId::ZERO);
CoverageIdsInfo { max_counter_id } CoverageIdsInfo { max_counter_id }
} }