mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compiler: Add rustc_abi to _sanitizers

Browse Source
This commit is contained in:
Jubilee Young 2024-11-02 20:28:42 -07:00
parent 31cbde037b
commit ab6994f880
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock
View File

@ -4337,6 +4337,7 @@ name = "rustc_sanitizers"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"rustc_abi",
"rustc_data_structures", "rustc_data_structures",
"rustc_hir", "rustc_hir",
"rustc_middle", "rustc_middle",

1
compiler/rustc_sanitizers/Cargo.toml
View File

@ -7,6 +7,7 @@ edition = "2021"
bitflags = "2.5.0" bitflags = "2.5.0"
tracing = "0.1" tracing = "0.1"
twox-hash = "1.6.3" twox-hash = "1.6.3"
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" } rustc_data_structures = { path = "../rustc_data_structures" }
rustc_hir = { path = "../rustc_hir" } rustc_hir = { path = "../rustc_hir" }
rustc_middle = { path = "../rustc_middle" } rustc_middle = { path = "../rustc_middle" }

5
compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/encode.rs
View File

@ -7,6 +7,7 @@
use std::fmt::Write as _; use std::fmt::Write as _;
use rustc_abi::{ExternAbi, Integer};
use rustc_data_structures::base_n::{ALPHANUMERIC_ONLY, CASE_INSENSITIVE, ToBaseN}; use rustc_data_structures::base_n::{ALPHANUMERIC_ONLY, CASE_INSENSITIVE, ToBaseN};
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_hir as hir; use rustc_hir as hir;
@ -18,8 +19,6 @@
}; };
use rustc_span::def_id::DefId; use rustc_span::def_id::DefId;
use rustc_span::sym; use rustc_span::sym;
use rustc_target::abi::Integer;
use rustc_target::spec::abi::Abi;
use tracing::instrument; use tracing::instrument;
use crate::cfi::typeid::TypeIdOptions; use crate::cfi::typeid::TypeIdOptions;
@ -185,7 +184,7 @@ fn encode_fnsig<'tcx>(
let mut encode_ty_options = EncodeTyOptions::from_bits(options.bits()) let mut encode_ty_options = EncodeTyOptions::from_bits(options.bits())
.unwrap_or_else(|| bug!("encode_fnsig: invalid option(s) `{:?}`", options.bits())); .unwrap_or_else(|| bug!("encode_fnsig: invalid option(s) `{:?}`", options.bits()));
match fn_sig.abi { match fn_sig.abi {
Abi::C { .. } => { ExternAbi::C { .. } => {
encode_ty_options.insert(EncodeTyOptions::GENERALIZE_REPR_C); encode_ty_options.insert(EncodeTyOptions::GENERALIZE_REPR_C);
} }
_ => { _ => {

2
compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/mod.rs
View File

@ -7,7 +7,7 @@
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_middle::bug; use rustc_middle::bug;
use rustc_middle::ty::{self, Instance, Ty, TyCtxt, TypeFoldable, TypeVisitableExt}; use rustc_middle::ty::{self, Instance, Ty, TyCtxt, TypeFoldable, TypeVisitableExt};
use rustc_target::abi::call::{Conv, FnAbi, PassMode}; use rustc_target::callconv::{Conv, FnAbi, PassMode};
use tracing::instrument; use tracing::instrument;
mod encode; mod encode;

2
compiler/rustc_sanitizers/src/cfi/typeid/mod.rs
View File

@ -6,7 +6,7 @@
use bitflags::bitflags; use bitflags::bitflags;
use rustc_middle::ty::{Instance, Ty, TyCtxt}; use rustc_middle::ty::{Instance, Ty, TyCtxt};
use rustc_target::abi::call::FnAbi; use rustc_target::callconv::FnAbi;
bitflags! { bitflags! {
/// Options for typeid_for_fnabi. /// Options for typeid_for_fnabi.

2
compiler/rustc_sanitizers/src/kcfi/typeid/mod.rs
View File

@ -7,7 +7,7 @@
use std::hash::Hasher; use std::hash::Hasher;
use rustc_middle::ty::{Instance, InstanceKind, ReifyReason, Ty, TyCtxt}; use rustc_middle::ty::{Instance, InstanceKind, ReifyReason, Ty, TyCtxt};
use rustc_target::abi::call::FnAbi; use rustc_target::callconv::FnAbi;
use twox_hash::XxHash64; use twox_hash::XxHash64;
pub use crate::cfi::typeid::{TypeIdOptions, itanium_cxx_abi}; pub use crate::cfi::typeid::{TypeIdOptions, itanium_cxx_abi};