Introduce MonoItemData
.
It replaces `(Linkage, Visibility)`, making the code nicer. Plus the next commit will add another field.
This commit is contained in:
parent
4f16abdff6
commit
46f74fb4d2
@ -5,7 +5,7 @@
|
|||||||
//! [`codegen_static`]: crate::constant::codegen_static
|
//! [`codegen_static`]: crate::constant::codegen_static
|
||||||
|
|
||||||
use rustc_data_structures::profiling::SelfProfilerRef;
|
use rustc_data_structures::profiling::SelfProfilerRef;
|
||||||
use rustc_middle::mir::mono::{Linkage as RLinkage, MonoItem, Visibility};
|
use rustc_middle::mir::mono::{MonoItem, MonoItemData};
|
||||||
|
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
@ -16,11 +16,11 @@ pub(crate) mod jit;
|
|||||||
fn predefine_mono_items<'tcx>(
|
fn predefine_mono_items<'tcx>(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
module: &mut dyn Module,
|
module: &mut dyn Module,
|
||||||
mono_items: &[(MonoItem<'tcx>, (RLinkage, Visibility))],
|
mono_items: &[(MonoItem<'tcx>, MonoItemData)],
|
||||||
) {
|
) {
|
||||||
tcx.prof.generic_activity("predefine functions").run(|| {
|
tcx.prof.generic_activity("predefine functions").run(|| {
|
||||||
let is_compiler_builtins = tcx.is_compiler_builtins(LOCAL_CRATE);
|
let is_compiler_builtins = tcx.is_compiler_builtins(LOCAL_CRATE);
|
||||||
for &(mono_item, (linkage, visibility)) in mono_items {
|
for &(mono_item, data) in mono_items {
|
||||||
match mono_item {
|
match mono_item {
|
||||||
MonoItem::Fn(instance) => {
|
MonoItem::Fn(instance) => {
|
||||||
let name = tcx.symbol_name(instance).name;
|
let name = tcx.symbol_name(instance).name;
|
||||||
@ -29,8 +29,8 @@ fn predefine_mono_items<'tcx>(
|
|||||||
get_function_sig(tcx, module.target_config().default_call_conv, instance);
|
get_function_sig(tcx, module.target_config().default_call_conv, instance);
|
||||||
let linkage = crate::linkage::get_clif_linkage(
|
let linkage = crate::linkage::get_clif_linkage(
|
||||||
mono_item,
|
mono_item,
|
||||||
linkage,
|
data.linkage,
|
||||||
visibility,
|
data.visibility,
|
||||||
is_compiler_builtins,
|
is_compiler_builtins,
|
||||||
);
|
);
|
||||||
module.declare_function(name, linkage, &sig).unwrap();
|
module.declare_function(name, linkage, &sig).unwrap();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user