diff --git a/0001-Revert-Auto-merge-of-99033-5225225-interpreter-valid.patch b/0001-Revert-Auto-merge-of-99033-5225225-interpreter-valid.patch new file mode 100644 index 0000000..866122c --- /dev/null +++ b/0001-Revert-Auto-merge-of-99033-5225225-interpreter-valid.patch @@ -0,0 +1,569 @@ +From 610ba6e6d5911088681a4a01a40dbc4d4942536f Mon Sep 17 00:00:00 2001 +From: David Abdurachmanov +Date: Mon, 28 Nov 2022 10:23:42 +0200 +Subject: [PATCH] Revert "Auto merge of #99033 - + 5225225:interpreter-validity-checks, r=oli-obk" + +This reverts commit 263edd43c5255084292329423c61a9d69715ebfa, reversing +changes made to c2ecd3af87477147695aa3f6e1237e3185044e62. +--- + Cargo.lock | 1 - + .../src/intrinsics/mod.rs | 15 ++++- + compiler/rustc_codegen_ssa/Cargo.toml | 1 - + compiler/rustc_codegen_ssa/src/mir/block.rs | 9 +-- + .../src/const_eval/machine.rs | 2 +- + .../src/interpret/intrinsics.rs | 56 ++++++++-------- + compiler/rustc_const_eval/src/lib.rs | 6 -- + .../src/might_permit_raw_init.rs | 44 ------------- + compiler/rustc_middle/src/query/mod.rs | 8 --- + compiler/rustc_middle/src/ty/query.rs | 1 - + compiler/rustc_query_impl/src/keys.rs | 12 +--- + compiler/rustc_target/src/abi/mod.rs | 38 ++++++----- + .../intrinsics/panic-uninitialized-zeroed.rs | 66 +++++++------------ + 13 files changed, 94 insertions(+), 165 deletions(-) + delete mode 100644 compiler/rustc_const_eval/src/might_permit_raw_init.rs + +diff --git a/Cargo.lock b/Cargo.lock +index fda523611a5..0e73dc68daf 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3300,7 +3300,6 @@ dependencies = [ + "rustc_arena", + "rustc_ast", + "rustc_attr", +- "rustc_const_eval", + "rustc_data_structures", + "rustc_errors", + "rustc_fs_util", +diff --git a/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs b/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs +index 2e4ca594f91..bd2a17c5738 100644 +--- a/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs ++++ b/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs +@@ -22,6 +22,7 @@ macro_rules! intrinsic_args { + use rustc_middle::ty::print::with_no_trimmed_paths; + use rustc_middle::ty::subst::SubstsRef; + use rustc_span::symbol::{kw, sym, Symbol}; ++use rustc_target::abi::InitKind; + + use crate::prelude::*; + use cranelift_codegen::ir::AtomicRmwOp; +@@ -734,7 +735,12 @@ fn swap(bcx: &mut FunctionBuilder<'_>, v: Value) -> Value { + return; + } + +- if intrinsic == sym::assert_zero_valid && !fx.tcx.permits_zero_init(layout) { ++ if intrinsic == sym::assert_zero_valid ++ && !layout.might_permit_raw_init( ++ fx, ++ InitKind::Zero, ++ fx.tcx.sess.opts.unstable_opts.strict_init_checks) { ++ + with_no_trimmed_paths!({ + crate::base::codegen_panic( + fx, +@@ -748,7 +754,12 @@ fn swap(bcx: &mut FunctionBuilder<'_>, v: Value) -> Value { + return; + } + +- if intrinsic == sym::assert_uninit_valid && !fx.tcx.permits_uninit_init(layout) { ++ if intrinsic == sym::assert_uninit_valid ++ && !layout.might_permit_raw_init( ++ fx, ++ InitKind::Uninit, ++ fx.tcx.sess.opts.unstable_opts.strict_init_checks) { ++ + with_no_trimmed_paths!({ + crate::base::codegen_panic( + fx, +diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml +index d868e3d56ba..fe8b39f503f 100644 +--- a/compiler/rustc_codegen_ssa/Cargo.toml ++++ b/compiler/rustc_codegen_ssa/Cargo.toml +@@ -39,7 +39,6 @@ rustc_metadata = { path = "../rustc_metadata" } + rustc_query_system = { path = "../rustc_query_system" } + rustc_target = { path = "../rustc_target" } + rustc_session = { path = "../rustc_session" } +-rustc_const_eval = { path = "../rustc_const_eval" } + + [dependencies.object] + version = "0.29.0" +diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs +index a6b226ef720..975a2051b17 100644 +--- a/compiler/rustc_codegen_ssa/src/mir/block.rs ++++ b/compiler/rustc_codegen_ssa/src/mir/block.rs +@@ -21,7 +21,7 @@ + use rustc_span::{sym, Symbol}; + use rustc_symbol_mangling::typeid::typeid_for_fnabi; + use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode, Reg}; +-use rustc_target::abi::{self, HasDataLayout, WrappingRange}; ++use rustc_target::abi::{self, HasDataLayout, InitKind, WrappingRange}; + use rustc_target::spec::abi::Abi; + + /// Used by `FunctionCx::codegen_terminator` for emitting common patterns +@@ -589,6 +589,7 @@ fn codegen_panic_intrinsic( + source_info: mir::SourceInfo, + target: Option, + cleanup: Option, ++ strict_validity: bool, + ) -> bool { + // Emit a panic or a no-op for `assert_*` intrinsics. + // These are intrinsics that compile to panics so that we can get a message +@@ -607,13 +608,12 @@ enum AssertIntrinsic { + }); + if let Some(intrinsic) = panic_intrinsic { + use AssertIntrinsic::*; +- + let ty = instance.unwrap().substs.type_at(0); + let layout = bx.layout_of(ty); + let do_panic = match intrinsic { + Inhabited => layout.abi.is_uninhabited(), +- ZeroValid => !bx.tcx().permits_zero_init(layout), +- UninitValid => !bx.tcx().permits_uninit_init(layout), ++ ZeroValid => !layout.might_permit_raw_init(bx, InitKind::Zero, strict_validity), ++ UninitValid => !layout.might_permit_raw_init(bx, InitKind::Uninit, strict_validity), + }; + if do_panic { + let msg_str = with_no_visible_paths!({ +@@ -748,6 +748,7 @@ fn codegen_call_terminator( + source_info, + target, + cleanup, ++ self.cx.tcx().sess.opts.unstable_opts.strict_init_checks, + ) { + return; + } +diff --git a/compiler/rustc_const_eval/src/const_eval/machine.rs b/compiler/rustc_const_eval/src/const_eval/machine.rs +index e5acacd9188..5274029d006 100644 +--- a/compiler/rustc_const_eval/src/const_eval/machine.rs ++++ b/compiler/rustc_const_eval/src/const_eval/machine.rs +@@ -93,7 +93,7 @@ pub struct CompileTimeInterpreter<'mir, 'tcx> { + } + + impl<'mir, 'tcx> CompileTimeInterpreter<'mir, 'tcx> { +- pub(crate) fn new( ++ pub(super) fn new( + const_eval_limit: Limit, + can_access_statics: bool, + check_alignment: bool, +diff --git a/compiler/rustc_const_eval/src/interpret/intrinsics.rs b/compiler/rustc_const_eval/src/interpret/intrinsics.rs +index 8637d6a7767..f7a11838154 100644 +--- a/compiler/rustc_const_eval/src/interpret/intrinsics.rs ++++ b/compiler/rustc_const_eval/src/interpret/intrinsics.rs +@@ -15,7 +15,7 @@ + use rustc_middle::ty::subst::SubstsRef; + use rustc_middle::ty::{Ty, TyCtxt}; + use rustc_span::symbol::{sym, Symbol}; +-use rustc_target::abi::{Abi, Align, Primitive, Size}; ++use rustc_target::abi::{Abi, Align, InitKind, Primitive, Size}; + + use super::{ + util::ensure_monomorphic_enough, CheckInAllocMsg, ImmTy, InterpCx, Machine, OpTy, PlaceTy, +@@ -435,33 +435,35 @@ pub fn emulate_intrinsic( + ), + )?; + } +- +- if intrinsic_name == sym::assert_zero_valid { +- let should_panic = !self.tcx.permits_zero_init(layout); +- +- if should_panic { +- M::abort( +- self, +- format!( +- "aborted execution: attempted to zero-initialize type `{}`, which is invalid", +- ty +- ), +- )?; +- } ++ if intrinsic_name == sym::assert_zero_valid ++ && !layout.might_permit_raw_init( ++ self, ++ InitKind::Zero, ++ self.tcx.sess.opts.unstable_opts.strict_init_checks, ++ ) ++ { ++ M::abort( ++ self, ++ format!( ++ "aborted execution: attempted to zero-initialize type `{}`, which is invalid", ++ ty ++ ), ++ )?; + } +- +- if intrinsic_name == sym::assert_uninit_valid { +- let should_panic = !self.tcx.permits_uninit_init(layout); +- +- if should_panic { +- M::abort( +- self, +- format!( +- "aborted execution: attempted to leave type `{}` uninitialized, which is invalid", +- ty +- ), +- )?; +- } ++ if intrinsic_name == sym::assert_uninit_valid ++ && !layout.might_permit_raw_init( ++ self, ++ InitKind::Uninit, ++ self.tcx.sess.opts.unstable_opts.strict_init_checks, ++ ) ++ { ++ M::abort( ++ self, ++ format!( ++ "aborted execution: attempted to leave type `{}` uninitialized, which is invalid", ++ ty ++ ), ++ )?; + } + } + sym::simd_insert => { +diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs +index 9f47d302a0c..8529726b533 100644 +--- a/compiler/rustc_const_eval/src/lib.rs ++++ b/compiler/rustc_const_eval/src/lib.rs +@@ -33,13 +33,11 @@ + pub mod const_eval; + mod errors; + pub mod interpret; +-mod might_permit_raw_init; + pub mod transform; + pub mod util; + + use rustc_middle::ty; + use rustc_middle::ty::query::Providers; +-use rustc_target::abi::InitKind; + + pub fn provide(providers: &mut Providers) { + const_eval::provide(providers); +@@ -61,8 +59,4 @@ pub fn provide(providers: &mut Providers) { + let (param_env, value) = param_env_and_value.into_parts(); + const_eval::deref_mir_constant(tcx, param_env, value) + }; +- providers.permits_uninit_init = +- |tcx, ty| might_permit_raw_init::might_permit_raw_init(tcx, ty, InitKind::Uninit); +- providers.permits_zero_init = +- |tcx, ty| might_permit_raw_init::might_permit_raw_init(tcx, ty, InitKind::Zero); + } +diff --git a/compiler/rustc_const_eval/src/might_permit_raw_init.rs b/compiler/rustc_const_eval/src/might_permit_raw_init.rs +deleted file mode 100644 +index 37ffa19ccd6..00000000000 +--- a/compiler/rustc_const_eval/src/might_permit_raw_init.rs ++++ /dev/null +@@ -1,44 +0,0 @@ +-use crate::const_eval::CompileTimeInterpreter; +-use crate::interpret::{InterpCx, MemoryKind, OpTy}; +-use rustc_middle::ty::layout::LayoutCx; +-use rustc_middle::ty::{layout::TyAndLayout, ParamEnv, TyCtxt}; +-use rustc_session::Limit; +-use rustc_target::abi::InitKind; +- +-pub fn might_permit_raw_init<'tcx>( +- tcx: TyCtxt<'tcx>, +- ty: TyAndLayout<'tcx>, +- kind: InitKind, +-) -> bool { +- let strict = tcx.sess.opts.unstable_opts.strict_init_checks; +- +- if strict { +- let machine = CompileTimeInterpreter::new( +- Limit::new(0), +- /*can_access_statics:*/ false, +- /*check_alignment:*/ true, +- ); +- +- let mut cx = InterpCx::new(tcx, rustc_span::DUMMY_SP, ParamEnv::reveal_all(), machine); +- +- let allocated = cx +- .allocate(ty, MemoryKind::Machine(crate::const_eval::MemoryKind::Heap)) +- .expect("OOM: failed to allocate for uninit check"); +- +- if kind == InitKind::Zero { +- cx.write_bytes_ptr( +- allocated.ptr, +- std::iter::repeat(0_u8).take(ty.layout.size().bytes_usize()), +- ) +- .expect("failed to write bytes for zero valid check"); +- } +- +- let ot: OpTy<'_, _> = allocated.into(); +- +- // Assume that if it failed, it's a validation failure. +- cx.validate_operand(&ot).is_ok() +- } else { +- let layout_cx = LayoutCx { tcx, param_env: ParamEnv::reveal_all() }; +- ty.might_permit_raw_init(&layout_cx, kind) +- } +-} +diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs +index 4b336ea62a9..6e5fe4e875e 100644 +--- a/compiler/rustc_middle/src/query/mod.rs ++++ b/compiler/rustc_middle/src/query/mod.rs +@@ -2085,12 +2085,4 @@ + desc { |tcx| "looking up generator diagnostic data of `{}`", tcx.def_path_str(key) } + separate_provide_extern + } +- +- query permits_uninit_init(key: TyAndLayout<'tcx>) -> bool { +- desc { "checking to see if {:?} permits being left uninit", key.ty } +- } +- +- query permits_zero_init(key: TyAndLayout<'tcx>) -> bool { +- desc { "checking to see if {:?} permits being left zeroed", key.ty } +- } + } +diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs +index a300a8df23d..dd0afe0605a 100644 +--- a/compiler/rustc_middle/src/ty/query.rs ++++ b/compiler/rustc_middle/src/ty/query.rs +@@ -28,7 +28,6 @@ + use crate::traits::specialization_graph; + use crate::traits::{self, ImplSource}; + use crate::ty::fast_reject::SimplifiedType; +-use crate::ty::layout::TyAndLayout; + use crate::ty::subst::{GenericArg, SubstsRef}; + use crate::ty::util::AlwaysRequiresDrop; + use crate::ty::GeneratorDiagnosticData; +diff --git a/compiler/rustc_query_impl/src/keys.rs b/compiler/rustc_query_impl/src/keys.rs +index 49175e97f41..4d6bb02c38e 100644 +--- a/compiler/rustc_query_impl/src/keys.rs ++++ b/compiler/rustc_query_impl/src/keys.rs +@@ -6,7 +6,7 @@ + use rustc_middle::traits; + use rustc_middle::ty::fast_reject::SimplifiedType; + use rustc_middle::ty::subst::{GenericArg, SubstsRef}; +-use rustc_middle::ty::{self, layout::TyAndLayout, Ty, TyCtxt}; ++use rustc_middle::ty::{self, Ty, TyCtxt}; + use rustc_span::symbol::{Ident, Symbol}; + use rustc_span::{Span, DUMMY_SP}; + +@@ -395,16 +395,6 @@ fn default_span(&self, _: TyCtxt<'_>) -> Span { + } + } + +-impl<'tcx> Key for TyAndLayout<'tcx> { +- #[inline(always)] +- fn query_crate_is_local(&self) -> bool { +- true +- } +- fn default_span(&self, _: TyCtxt<'_>) -> Span { +- DUMMY_SP +- } +-} +- + impl<'tcx> Key for (Ty<'tcx>, Ty<'tcx>) { + #[inline(always)] + fn query_crate_is_local(&self) -> bool { +diff --git a/compiler/rustc_target/src/abi/mod.rs b/compiler/rustc_target/src/abi/mod.rs +index ec334e5887a..b4f92ddd9a0 100644 +--- a/compiler/rustc_target/src/abi/mod.rs ++++ b/compiler/rustc_target/src/abi/mod.rs +@@ -1389,7 +1389,7 @@ pub struct PointeeInfo { + + /// Used in `might_permit_raw_init` to indicate the kind of initialisation + /// that is checked to be valid +-#[derive(Copy, Clone, Debug, PartialEq, Eq)] ++#[derive(Copy, Clone, Debug)] + pub enum InitKind { + Zero, + Uninit, +@@ -1504,18 +1504,14 @@ pub fn is_zst(&self) -> bool { + /// + /// `init_kind` indicates if the memory is zero-initialized or left uninitialized. + /// +- /// This code is intentionally conservative, and will not detect +- /// * zero init of an enum whose 0 variant does not allow zero initialization +- /// * making uninitialized types who have a full valid range (ints, floats, raw pointers) +- /// * Any form of invalid value being made inside an array (unless the value is uninhabited) ++ /// `strict` is an opt-in debugging flag added in #97323 that enables more checks. + /// +- /// A strict form of these checks that uses const evaluation exists in +- /// `rustc_const_eval::might_permit_raw_init`, and a tracking issue for making these checks +- /// stricter is . ++ /// This is conservative: in doubt, it will answer `true`. + /// +- /// FIXME: Once all the conservatism is removed from here, and the checks are ran by default, +- /// we can use the const evaluation checks always instead. +- pub fn might_permit_raw_init(self, cx: &C, init_kind: InitKind) -> bool ++ /// FIXME: Once we removed all the conservatism, we could alternatively ++ /// create an all-0/all-undef constant and run the const value validator to see if ++ /// this is a valid value for the given type. ++ pub fn might_permit_raw_init(self, cx: &C, init_kind: InitKind, strict: bool) -> bool + where + Self: Copy, + Ty: TyAbiInterface<'a, C>, +@@ -1528,8 +1524,13 @@ pub fn might_permit_raw_init(self, cx: &C, init_kind: InitKind) -> bool + s.valid_range(cx).contains(0) + } + InitKind::Uninit => { +- // The range must include all values. +- s.is_always_valid(cx) ++ if strict { ++ // The type must be allowed to be uninit (which means "is a union"). ++ s.is_uninit_valid() ++ } else { ++ // The range must include all values. ++ s.is_always_valid(cx) ++ } + } + } + }; +@@ -1550,12 +1551,19 @@ pub fn might_permit_raw_init(self, cx: &C, init_kind: InitKind) -> bool + // If we have not found an error yet, we need to recursively descend into fields. + match &self.fields { + FieldsShape::Primitive | FieldsShape::Union { .. } => {} +- FieldsShape::Array { .. } => { ++ FieldsShape::Array { count, .. } => { + // FIXME(#66151): For now, we are conservative and do not check arrays by default. ++ if strict ++ && *count > 0 ++ && !self.field(cx, 0).might_permit_raw_init(cx, init_kind, strict) ++ { ++ // Found non empty array with a type that is unhappy about this kind of initialization ++ return false; ++ } + } + FieldsShape::Arbitrary { offsets, .. } => { + for idx in 0..offsets.len() { +- if !self.field(cx, idx).might_permit_raw_init(cx, init_kind) { ++ if !self.field(cx, idx).might_permit_raw_init(cx, init_kind, strict) { + // We found a field that is unhappy with this kind of initialization. + return false; + } +diff --git a/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs b/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs +index 255151a9603..3ffd35ecdb8 100644 +--- a/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs ++++ b/src/test/ui/intrinsics/panic-uninitialized-zeroed.rs +@@ -57,13 +57,6 @@ enum LR_NonZero { + + struct ZeroSized; + +-#[allow(dead_code)] +-#[repr(i32)] +-enum ZeroIsValid { +- Zero(u8) = 0, +- One(NonNull<()>) = 1, +-} +- + fn test_panic_msg(op: impl (FnOnce() -> T) + panic::UnwindSafe, msg: &str) { + let err = panic::catch_unwind(op).err(); + assert_eq!( +@@ -159,12 +152,33 @@ fn main() { + "attempted to zero-initialize type `*const dyn core::marker::Send`, which is invalid" + ); + ++ /* FIXME(#66151) we conservatively do not error here yet. ++ test_panic_msg( ++ || mem::uninitialized::(), ++ "attempted to leave type `LR_NonZero` uninitialized, which is invalid" ++ ); ++ test_panic_msg( ++ || mem::zeroed::(), ++ "attempted to zero-initialize type `LR_NonZero`, which is invalid" ++ ); ++ ++ test_panic_msg( ++ || mem::uninitialized::>(), ++ "attempted to leave type `std::mem::ManuallyDrop` uninitialized, \ ++ which is invalid" ++ ); ++ test_panic_msg( ++ || mem::zeroed::>(), ++ "attempted to zero-initialize type `std::mem::ManuallyDrop`, \ ++ which is invalid" ++ ); ++ */ ++ + test_panic_msg( + || mem::uninitialized::<(NonNull, u32, u32)>(), + "attempted to leave type `(core::ptr::non_null::NonNull, u32, u32)` uninitialized, \ + which is invalid" + ); +- + test_panic_msg( + || mem::zeroed::<(NonNull, u32, u32)>(), + "attempted to zero-initialize type `(core::ptr::non_null::NonNull, u32, u32)`, \ +@@ -182,23 +196,11 @@ fn main() { + which is invalid" + ); + +- test_panic_msg( +- || mem::uninitialized::(), +- "attempted to leave type `LR_NonZero` uninitialized, which is invalid" +- ); +- +- test_panic_msg( +- || mem::uninitialized::>(), +- "attempted to leave type `core::mem::manually_drop::ManuallyDrop` uninitialized, \ +- which is invalid" +- ); +- + test_panic_msg( + || mem::uninitialized::(), + "attempted to leave type `NoNullVariant` uninitialized, \ + which is invalid" + ); +- + test_panic_msg( + || mem::zeroed::(), + "attempted to zero-initialize type `NoNullVariant`, \ +@@ -210,12 +212,10 @@ fn main() { + || mem::uninitialized::(), + "attempted to leave type `bool` uninitialized, which is invalid" + ); +- + test_panic_msg( + || mem::uninitialized::(), + "attempted to leave type `LR` uninitialized, which is invalid" + ); +- + test_panic_msg( + || mem::uninitialized::>(), + "attempted to leave type `core::mem::manually_drop::ManuallyDrop` uninitialized, which is invalid" +@@ -229,7 +229,6 @@ fn main() { + let _val = mem::zeroed::>(); + let _val = mem::zeroed::>>(); + let _val = mem::zeroed::<[!; 0]>(); +- let _val = mem::zeroed::(); + let _val = mem::uninitialized::>(); + let _val = mem::uninitialized::<[!; 0]>(); + let _val = mem::uninitialized::<()>(); +@@ -260,33 +259,12 @@ fn main() { + || mem::zeroed::<[NonNull<()>; 1]>(), + "attempted to zero-initialize type `[core::ptr::non_null::NonNull<()>; 1]`, which is invalid" + ); +- +- // FIXME(#66151) we conservatively do not error here yet (by default). +- test_panic_msg( +- || mem::zeroed::(), +- "attempted to zero-initialize type `LR_NonZero`, which is invalid" +- ); +- +- test_panic_msg( +- || mem::zeroed::>(), +- "attempted to zero-initialize type `core::mem::manually_drop::ManuallyDrop`, \ +- which is invalid" +- ); + } else { + // These are UB because they have not been officially blessed, but we await the resolution + // of before doing + // anything about that. + let _val = mem::uninitialized::(); + let _val = mem::uninitialized::<*const ()>(); +- +- // These are UB, but best to test them to ensure we don't become unintentionally +- // stricter. +- +- // It's currently unchecked to create invalid enums and values inside arrays. +- let _val = mem::zeroed::(); +- let _val = mem::zeroed::<[LR_NonZero; 1]>(); +- let _val = mem::zeroed::<[NonNull<()>; 1]>(); +- let _val = mem::uninitialized::<[NonNull<()>; 1]>(); + } + } + } +-- +2.37.1 + diff --git a/rust.spec b/rust.spec index 6c212b6..b4ce2a9 100644 --- a/rust.spec +++ b/rust.spec @@ -88,7 +88,7 @@ Name: rust Version: 1.65.0 -Release: 1.0.riscv64%{?dist} +Release: 1.1.riscv64%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -116,6 +116,8 @@ Patch3: 0001-rustc_transmute-fix-big-endian-discriminants.patch # https://github.com/rust-lang/rust/pull/103072 Patch4: 0001-compiletest-set-the-dylib-path-when-gathering-target.patch +Patch7: 0001-Revert-Auto-merge-of-99033-5225225-interpreter-valid.patch + ### RHEL-specific patches below ### # Simple rpm macros for rust-toolset (as opposed to full rust-packaging) @@ -592,6 +594,7 @@ test -f '%{local_rust_root}/bin/rustc' %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch7 -p1 %if %with disabled_libssh2 %patch100 -p1 @@ -1056,6 +1059,9 @@ end} %changelog +* Mon Nov 28 2022 David Abdurachmanov - 1.65.0-1.1.riscv64 +- Revert 263edd43c5255084292329423c61a9d69715ebfa + * Mon Nov 28 2022 David Abdurachmanov - 1.65.0-1.0.riscv64 - Enable riscv64