Skip to content

Commit d76afa7

Browse files
committed
Sync from rust a8387aef8c378a771686878062e544af4d5e2245
2 parents eded369 + 881208f commit d76afa7

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

scripts/filter_profile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
9696
stack = &stack[..index + REPORT_SYMBOL_NAMES.len()];
9797
}
9898

99-
const ENCODE_METADATA: &str = "rustc_middle::ty::context::TyCtxt::encode_metadata";
99+
const ENCODE_METADATA: &str = "rustc_metadata::rmeta::encoder::encode_metadata";
100100
if let Some(index) = stack.find(ENCODE_METADATA) {
101101
stack = &stack[..index + ENCODE_METADATA.len()];
102102
}

src/driver/aot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::path::PathBuf;
66
use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
77
use rustc_codegen_ssa::{CodegenResults, CompiledModule, CrateInfo, ModuleKind};
88
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
9+
use rustc_metadata::EncodedMetadata;
910
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
10-
use rustc_middle::middle::cstore::EncodedMetadata;
1111
use rustc_middle::mir::mono::{CodegenUnit, MonoItem};
1212
use rustc_session::cgu_reuse_tracker::CguReuse;
1313
use rustc_session::config::{DebugInfo, OutputType};

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use std::any::Any;
3030
use rustc_codegen_ssa::traits::CodegenBackend;
3131
use rustc_codegen_ssa::CodegenResults;
3232
use rustc_errors::ErrorReported;
33+
use rustc_metadata::EncodedMetadata;
3334
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
34-
use rustc_middle::middle::cstore::EncodedMetadata;
3535
use rustc_session::config::OutputFilenames;
3636
use rustc_session::Session;
3737

src/metadata.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
use object::write::{Object, StandardSegment, Symbol, SymbolSection};
44
use object::{SectionKind, SymbolFlags, SymbolKind, SymbolScope};
55

6-
use rustc_middle::middle::cstore::EncodedMetadata;
6+
use rustc_metadata::EncodedMetadata;
77
use rustc_middle::ty::TyCtxt;
88

99
// Adapted from https://github.com/rust-lang/rust/blob/da573206f87b5510de4b0ee1a9c044127e409bd3/src/librustc_codegen_llvm/base.rs#L47-L112
10-
pub(crate) fn new_metadata_object(tcx: TyCtxt<'_>, cgu_name: &str, metadata: &EncodedMetadata) -> Vec<u8> {
10+
pub(crate) fn new_metadata_object(
11+
tcx: TyCtxt<'_>,
12+
cgu_name: &str,
13+
metadata: &EncodedMetadata,
14+
) -> Vec<u8> {
1115
use snap::write::FrameEncoder;
1216
use std::io::Write;
1317

1418
let mut compressed = rustc_metadata::METADATA_HEADER.to_vec();
15-
FrameEncoder::new(&mut compressed).write_all(&metadata.raw_data).unwrap();
19+
FrameEncoder::new(&mut compressed).write_all(metadata.raw_data()).unwrap();
1620

1721
let triple = crate::target_triple(tcx.sess);
1822

0 commit comments

Comments
 (0)