Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit cb570d6

Browse files
committed
Move coverageinfo::ffi and coverageinfo::map out of SSA
1 parent 9c430d3 commit cb570d6

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed
File renamed without changes.

‎compiler/rustc_codegen_ssa/src/coverageinfo/map.rs‎ renamed to ‎compiler/rustc_codegen_llvm/src/coverageinfo/map_data.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
pub use super::ffi::*;
22

33
use rustc_index::{IndexSlice, IndexVec};
4+
use rustc_middle::bug;
45
use rustc_middle::mir::coverage::{
56
CodeRegion, CounterValueReference, ExpressionOperandId, InjectedExpressionId,
67
InjectedExpressionIndex, MappedExpressionIndex, Op,

‎compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::common::CodegenCx;
22
use crate::coverageinfo;
3+
use crate::coverageinfo::map_data::{Counter, CounterExpression};
34
use crate::llvm;
45

56
use llvm::coverageinfo::CounterMappingRegion;
6-
use rustc_codegen_ssa::coverageinfo::map::{Counter, CounterExpression};
77
use rustc_codegen_ssa::traits::ConstMethods;
88
use rustc_data_structures::fx::FxIndexSet;
99
use rustc_hir::def::DefKind;

‎compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use crate::llvm;
33
use crate::abi::Abi;
44
use crate::builder::Builder;
55
use crate::common::CodegenCx;
6+
use crate::coverageinfo::map_data::{CounterExpression, FunctionCoverage};
67

78
use libc::c_uint;
89
use llvm::coverageinfo::CounterMappingRegion;
9-
use rustc_codegen_ssa::coverageinfo::map::{CounterExpression, FunctionCoverage};
1010
use rustc_codegen_ssa::traits::{
1111
BaseTypeMethods, BuilderMethods, ConstMethods, CoverageInfoBuilderMethods, MiscMethods,
1212
StaticMethods,
@@ -28,6 +28,8 @@ use rustc_middle::ty::Instance;
2828
use std::cell::RefCell;
2929
use std::ffi::CString;
3030

31+
mod ffi;
32+
pub(crate) mod map_data;
3133
pub mod mapgen;
3234

3335
const UNUSED_FUNCTION_COUNTER_ID: CounterValueReference = CounterValueReference::START;

‎compiler/rustc_codegen_llvm/src/llvm/ffi.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(non_camel_case_types)]
22
#![allow(non_upper_case_globals)]
33

4-
use rustc_codegen_ssa::coverageinfo::map as coverage_map;
4+
use crate::coverageinfo::map_data as coverage_map;
55

66
use super::debuginfo::{
77
DIArray, DIBasicType, DIBuilder, DICompositeType, DIDerivedType, DIDescriptor, DIEnumerator,

‎compiler/rustc_codegen_ssa/src/coverageinfo/mod.rs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎compiler/rustc_codegen_ssa/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pub mod back;
4848
pub mod base;
4949
pub mod codegen_attrs;
5050
pub mod common;
51-
pub mod coverageinfo;
5251
pub mod debuginfo;
5352
pub mod errors;
5453
pub mod glue;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /