Skip to content

Commit 78bb5ee

Browse files
borsbors
committed
Auto merge of rust-lang#132756 - workingjubilee:rollup-bed2akn, r=workingjubilee
Rollup of 10 pull requests Successful merges: - rust-lang#130586 (Set "symbol name" in raw-dylib import libraries to the decorated name) - rust-lang#131913 (Add `{ignore,needs}-{rustc,std}-debug-assertions` directive support) - rust-lang#132095 (Fix rust-lang#131977 parens mangled in shared mut static lint suggestion) - rust-lang#132131 ([StableMIR] API to retrieve definitions from crates) - rust-lang#132639 (core: move intrinsics.rs into intrinsics folder) - rust-lang#132696 (Compile `test_num_f128` conditionally on `reliable_f128_math` config) - rust-lang#132737 (bootstrap: Print better message if lock pid isn't available) - rust-lang#132739 (Fix `librustdoc/scrape_examples.rs` formatting) - rust-lang#132740 (Update test for LLVM 20's new vector splat syntax) - rust-lang#132741 (Update mips64 data layout to match LLVM 20 change) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5b20c45 + 97dbab9 commit 78bb5ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+569
-141
lines changed

‎compiler/rustc_codegen_gcc/src/archive.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::path::Path;
22

33
use rustc_codegen_ssa::back::archive::{
44
ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, DEFAULT_OBJECT_READER,
5+
ImportLibraryItem,
56
};
67
use rustc_session::Session;
78

@@ -16,7 +17,7 @@ impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder {
1617
&self,
1718
_sess: &Session,
1819
_lib_name: &str,
19-
_import_name_and_ordinal_vector: Vec<(String, Option<u16>)>,
20+
_items: Vec<ImportLibraryItem>,
2021
_output_path: &Path,
2122
) {
2223
unimplemented!("creating dll imports is not yet supported");

‎compiler/rustc_codegen_llvm/src/callee.rs

+16-9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,22 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
4444
let llfn = if tcx.sess.target.arch == "x86"
4545
&& let Some(dllimport) = crate::common::get_dllimport(tcx, instance_def_id, sym)
4646
{
47+
// When calling functions in generated import libraries, MSVC needs
48+
// the fully decorated name (as would have been in the declaring
49+
// object file), but MinGW wants the name as exported (as would be
50+
// in the def file) which may be missing decorations.
51+
let mingw_gnu_toolchain = common::is_mingw_gnu_toolchain(&tcx.sess.target);
52+
let llfn = cx.declare_fn(
53+
&common::i686_decorated_name(
54+
dllimport,
55+
mingw_gnu_toolchain,
56+
true,
57+
!mingw_gnu_toolchain,
58+
),
59+
fn_abi,
60+
Some(instance),
61+
);
62+
4763
// Fix for https://github.com/rust-lang/rust/issues/104453
4864
// On x86 Windows, LLVM uses 'L' as the prefix for any private
4965
// global symbols, so when we create an undecorated function symbol
@@ -55,15 +71,6 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
5571
// LLVM will prefix the name with `__imp_`. Ideally, we'd like the
5672
// existing logic below to set the Storage Class, but it has an
5773
// exemption for MinGW for backwards compatibility.
58-
let llfn = cx.declare_fn(
59-
&common::i686_decorated_name(
60-
dllimport,
61-
common::is_mingw_gnu_toolchain(&tcx.sess.target),
62-
true,
63-
),
64-
fn_abi,
65-
Some(instance),
66-
);
6774
unsafe {
6875
llvm::LLVMSetDLLStorageClass(llfn, llvm::DLLStorageClass::DllImport);
6976
}

‎compiler/rustc_codegen_llvm/src/consts.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,10 @@ fn check_and_apply_linkage<'ll, 'tcx>(
194194
unsafe { llvm::LLVMSetInitializer(g2, g1) };
195195
g2
196196
} else if cx.tcx.sess.target.arch == "x86"
197+
&& common::is_mingw_gnu_toolchain(&cx.tcx.sess.target)
197198
&& let Some(dllimport) = crate::common::get_dllimport(cx.tcx, def_id, sym)
198199
{
199-
cx.declare_global(
200-
&common::i686_decorated_name(
201-
dllimport,
202-
common::is_mingw_gnu_toolchain(&cx.tcx.sess.target),
203-
true,
204-
),
205-
llty,
206-
)
200+
cx.declare_global(&common::i686_decorated_name(dllimport, true, true, false), llty)
207201
} else {
208202
// Generate an external declaration.
209203
// FIXME(nagisa): investigate whether it can be changed into define_global

‎compiler/rustc_codegen_llvm/src/context.rs

+5
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ pub(crate) unsafe fn create_module<'ll>(
154154
// See https://github.com/llvm/llvm-project/pull/106951
155155
target_data_layout = target_data_layout.replace("-i128:128", "");
156156
}
157+
if sess.target.arch.starts_with("mips64") {
158+
// LLVM 20 updates the mips64 layout to correctly align 128 bit integers to 128 bit.
159+
// See https://github.com/llvm/llvm-project/pull/112084
160+
target_data_layout = target_data_layout.replace("-i128:128", "");
161+
}
157162
}
158163

159164
// Ensure the data-layout values hardcoded remain the defaults.

‎compiler/rustc_codegen_ssa/src/back/archive.rs

+37-26
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,35 @@ use crate::errors::{
2626
DlltoolFailImportLibrary, ErrorCallingDllTool, ErrorCreatingImportLibrary, ErrorWritingDEFFile,
2727
};
2828

29+
/// An item to be included in an import library.
30+
/// This is a slimmed down version of `COFFShortExport` from `ar-archive-writer`.
31+
pub struct ImportLibraryItem {
32+
/// The name to be exported.
33+
pub name: String,
34+
/// The ordinal to be exported, if any.
35+
pub ordinal: Option<u16>,
36+
/// The original, decorated name if `name` is not decorated.
37+
pub symbol_name: Option<String>,
38+
/// True if this is a data export, false if it is a function export.
39+
pub is_data: bool,
40+
}
41+
42+
impl From<ImportLibraryItem> for COFFShortExport {
43+
fn from(item: ImportLibraryItem) -> Self {
44+
COFFShortExport {
45+
name: item.name,
46+
ext_name: None,
47+
symbol_name: item.symbol_name,
48+
alias_target: None,
49+
ordinal: item.ordinal.unwrap_or(0),
50+
noname: item.ordinal.is_some(),
51+
data: item.is_data,
52+
private: false,
53+
constant: false,
54+
}
55+
}
56+
}
57+
2958
pub trait ArchiveBuilderBuilder {
3059
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder + 'a>;
3160

@@ -38,7 +67,7 @@ pub trait ArchiveBuilderBuilder {
3867
&self,
3968
sess: &Session,
4069
lib_name: &str,
41-
import_name_and_ordinal_vector: Vec<(String, Option<u16>)>,
70+
items: Vec<ImportLibraryItem>,
4271
output_path: &Path,
4372
) {
4473
if common::is_mingw_gnu_toolchain(&sess.target) {
@@ -47,21 +76,16 @@ pub trait ArchiveBuilderBuilder {
4776
// that loaded but crashed with an AV upon calling one of the imported
4877
// functions. Therefore, use binutils to create the import library instead,
4978
// by writing a .DEF file to the temp dir and calling binutils's dlltool.
50-
create_mingw_dll_import_lib(
51-
sess,
52-
lib_name,
53-
import_name_and_ordinal_vector,
54-
output_path,
55-
);
79+
create_mingw_dll_import_lib(sess, lib_name, items, output_path);
5680
} else {
5781
trace!("creating import library");
5882
trace!(" dll_name {:#?}", lib_name);
5983
trace!(" output_path {}", output_path.display());
6084
trace!(
6185
" import names: {}",
62-
import_name_and_ordinal_vector
86+
items
6387
.iter()
64-
.map(|(name, _ordinal)| name.clone())
88+
.map(|ImportLibraryItem { name, .. }| name.clone())
6589
.collect::<Vec<_>>()
6690
.join(", "),
6791
);
@@ -79,20 +103,7 @@ pub trait ArchiveBuilderBuilder {
79103
.emit_fatal(ErrorCreatingImportLibrary { lib_name, error: error.to_string() }),
80104
};
81105

82-
let exports = import_name_and_ordinal_vector
83-
.iter()
84-
.map(|(name, ordinal)| COFFShortExport {
85-
name: name.to_string(),
86-
ext_name: None,
87-
symbol_name: None,
88-
alias_target: None,
89-
ordinal: ordinal.unwrap_or(0),
90-
noname: ordinal.is_some(),
91-
data: false,
92-
private: false,
93-
constant: false,
94-
})
95-
.collect::<Vec<_>>();
106+
let exports = items.into_iter().map(Into::into).collect::<Vec<_>>();
96107
let machine = match &*sess.target.arch {
97108
"x86_64" => MachineTypes::AMD64,
98109
"x86" => MachineTypes::I386,
@@ -160,16 +171,16 @@ pub trait ArchiveBuilderBuilder {
160171
fn create_mingw_dll_import_lib(
161172
sess: &Session,
162173
lib_name: &str,
163-
import_name_and_ordinal_vector: Vec<(String, Option<u16>)>,
174+
items: Vec<ImportLibraryItem>,
164175
output_path: &Path,
165176
) {
166177
let def_file_path = output_path.with_extension("def");
167178

168179
let def_file_content = format!(
169180
"EXPORTS\n{}",
170-
import_name_and_ordinal_vector
181+
items
171182
.into_iter()
172-
.map(|(name, ordinal)| {
183+
.map(|ImportLibraryItem { name, ordinal, .. }| {
173184
match ordinal {
174185
Some(n) => format!("{name} @{n} NONAME"),
175186
None => name,

‎compiler/rustc_codegen_ssa/src/back/link.rs

+27-8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use rustc_target::spec::{
4545
use tempfile::Builder as TempFileBuilder;
4646
use tracing::{debug, info, warn};
4747

48-
use super::archive::{ArchiveBuilder, ArchiveBuilderBuilder};
48+
use super::archive::{ArchiveBuilder, ArchiveBuilderBuilder, ImportLibraryItem};
4949
use super::command::Command;
5050
use super::linker::{self, Linker};
5151
use super::metadata::{MetadataPosition, create_wrapper_file};
@@ -495,24 +495,43 @@ fn create_dll_import_libs<'a>(
495495

496496
let mingw_gnu_toolchain = common::is_mingw_gnu_toolchain(&sess.target);
497497

498-
let import_name_and_ordinal_vector: Vec<(String, Option<u16>)> = raw_dylib_imports
498+
let items: Vec<ImportLibraryItem> = raw_dylib_imports
499499
.iter()
500500
.map(|import: &DllImport| {
501501
if sess.target.arch == "x86" {
502-
(
503-
common::i686_decorated_name(import, mingw_gnu_toolchain, false),
504-
import.ordinal(),
505-
)
502+
ImportLibraryItem {
503+
name: common::i686_decorated_name(
504+
import,
505+
mingw_gnu_toolchain,
506+
false,
507+
false,
508+
),
509+
ordinal: import.ordinal(),
510+
symbol_name: import.is_missing_decorations().then(|| {
511+
common::i686_decorated_name(
512+
import,
513+
mingw_gnu_toolchain,
514+
false,
515+
true,
516+
)
517+
}),
518+
is_data: !import.is_fn,
519+
}
506520
} else {
507-
(import.name.to_string(), import.ordinal())
521+
ImportLibraryItem {
522+
name: import.name.to_string(),
523+
ordinal: import.ordinal(),
524+
symbol_name: None,
525+
is_data: !import.is_fn,
526+
}
508527
}
509528
})
510529
.collect();
511530

512531
archive_builder_builder.create_dll_import_lib(
513532
sess,
514533
&raw_dylib_name,
515-
import_name_and_ordinal_vector,
534+
items,
516535
&output_path,
517536
);
518537

‎compiler/rustc_codegen_ssa/src/common.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,15 @@ pub fn i686_decorated_name(
187187
dll_import: &DllImport,
188188
mingw: bool,
189189
disable_name_mangling: bool,
190+
force_fully_decorated: bool,
190191
) -> String {
191192
let name = dll_import.name.as_str();
192193

193-
let (add_prefix, add_suffix) = match dll_import.import_name_type {
194-
Some(PeImportNameType::NoPrefix) => (false, true),
195-
Some(PeImportNameType::Undecorated) => (false, false),
194+
let (add_prefix, add_suffix) = match (force_fully_decorated, dll_import.import_name_type) {
195+
// No prefix is a bit weird, in that LLVM/ar_archive_writer won't emit it, so we will
196+
// ignore `force_fully_decorated` and always partially decorate it.
197+
(_, Some(PeImportNameType::NoPrefix)) => (false, true),
198+
(false, Some(PeImportNameType::Undecorated)) => (false, false),
196199
_ => (true, true),
197200
};
198201

‎compiler/rustc_lint/src/static_mut_refs.rs

+19-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use rustc_hir::{Expr, Stmt};
33
use rustc_middle::ty::{Mutability, TyKind};
44
use rustc_session::lint::FutureIncompatibilityReason;
55
use rustc_session::{declare_lint, declare_lint_pass};
6-
use rustc_span::Span;
76
use rustc_span::edition::Edition;
7+
use rustc_span::{BytePos, Span};
88

99
use crate::lints::{MutRefSugg, RefOfMutStatic};
1010
use crate::{LateContext, LateLintPass, LintContext};
@@ -71,13 +71,24 @@ impl<'tcx> LateLintPass<'tcx> for StaticMutRefs {
7171
if matches!(borrow_kind, hir::BorrowKind::Ref)
7272
&& let Some(err_span) = path_is_static_mut(ex, err_span) =>
7373
{
74-
emit_static_mut_refs(
75-
cx,
76-
err_span,
77-
err_span.with_hi(ex.span.lo()),
78-
m,
79-
!expr.span.from_expansion(),
80-
);
74+
let source_map = cx.sess().source_map();
75+
let snippet = source_map.span_to_snippet(err_span);
76+
77+
let sugg_span = if let Ok(snippet) = snippet {
78+
// ( ( &IDENT ) )
79+
// ~~~~ exclude these from the suggestion span to avoid unmatching parens
80+
let exclude_n_bytes: u32 = snippet
81+
.chars()
82+
.take_while(|ch| ch.is_whitespace() || *ch == '(')
83+
.map(|ch| ch.len_utf8() as u32)
84+
.sum();
85+
86+
err_span.with_lo(err_span.lo() + BytePos(exclude_n_bytes)).with_hi(ex.span.lo())
87+
} else {
88+
err_span.with_hi(ex.span.lo())
89+
};
90+
91+
emit_static_mut_refs(cx, err_span, sugg_span, m, !expr.span.from_expansion());
8192
}
8293
hir::ExprKind::MethodCall(_, e, _, _)
8394
if let Some(err_span) = path_is_static_mut(e, expr.span)

‎compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ provide! { tcx, def_id, other, cdata,
384384
crate_hash => { cdata.root.header.hash }
385385
crate_host_hash => { cdata.host_hash }
386386
crate_name => { cdata.root.header.name }
387+
num_extern_def_ids => { cdata.num_def_ids() }
387388

388389
extra_filename => { cdata.root.extra_filename.clone() }
389390

‎compiler/rustc_middle/src/query/mod.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1844,6 +1844,16 @@ rustc_queries! {
18441844
desc { |tcx| "computing crate imported by `{}`", tcx.def_path_str(def_id) }
18451845
}
18461846

1847+
/// Gets the number of definitions in a foreign crate.
1848+
///
1849+
/// This allows external tools to iterate over all definitions in a foreign crate.
1850+
///
1851+
/// This should never be used for the local crate, instead use `iter_local_def_id`.
1852+
query num_extern_def_ids(_: CrateNum) -> usize {
1853+
desc { "fetching the number of definitions in a crate" }
1854+
separate_provide_extern
1855+
}
1856+
18471857
query lib_features(_: CrateNum) -> &'tcx LibFeatures {
18481858
desc { "calculating the lib features defined in a crate" }
18491859
separate_provide_extern

‎compiler/rustc_session/src/cstore.rs

+5
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ impl DllImport {
130130
None
131131
}
132132
}
133+
134+
pub fn is_missing_decorations(&self) -> bool {
135+
self.import_name_type == Some(PeImportNameType::Undecorated)
136+
|| self.import_name_type == Some(PeImportNameType::NoPrefix)
137+
}
133138
}
134139

135140
/// Calling convention for a function defined in an external library.

‎compiler/rustc_smir/src/rustc_smir/context.rs

+15-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use stable_mir::{Crate, CrateDef, CrateItem, CrateNum, DefId, Error, Filename, I
3434

3535
use crate::rustc_internal::RustcInternal;
3636
use crate::rustc_smir::builder::BodyBuilder;
37-
use crate::rustc_smir::{Stable, Tables, alloc, new_item_kind, smir_crate};
37+
use crate::rustc_smir::{Stable, Tables, alloc, filter_def_ids, new_item_kind, smir_crate};
3838

3939
impl<'tcx> Context for TablesWrapper<'tcx> {
4040
fn target_info(&self) -> MachineInfo {
@@ -80,6 +80,20 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
8080
.collect()
8181
}
8282

83+
fn crate_functions(&self, crate_num: CrateNum) -> Vec<FnDef> {
84+
let mut tables = self.0.borrow_mut();
85+
let tcx = tables.tcx;
86+
let krate = crate_num.internal(&mut *tables, tcx);
87+
filter_def_ids(tcx, krate, |def_id| tables.to_fn_def(def_id))
88+
}
89+
90+
fn crate_statics(&self, crate_num: CrateNum) -> Vec<StaticDef> {
91+
let mut tables = self.0.borrow_mut();
92+
let tcx = tables.tcx;
93+
let krate = crate_num.internal(&mut *tables, tcx);
94+
filter_def_ids(tcx, krate, |def_id| tables.to_static(def_id))
95+
}
96+
8397
fn foreign_module(
8498
&self,
8599
mod_def: stable_mir::ty::ForeignModuleDef,

0 commit comments

Comments
 (0)