about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntoni Boucher <bouanto@zoho.com>2023-10-25 20:41:39 -0400
committerAntoni Boucher <bouanto@zoho.com>2023-10-25 20:41:39 -0400
commit42e37059a3bf0576dac84f4666bce3d09840f19b (patch)
tree62a19492b4e85d60d0d6515a34abe87f3e728554
parent4d66cd8aa8e61cf5afc7160ad071280330a5e034 (diff)
downloadrust-42e37059a3bf0576dac84f4666bce3d09840f19b.tar.gz
rust-42e37059a3bf0576dac84f4666bce3d09840f19b.zip
Fix rebase
-rw-r--r--src/abi.rs15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/abi.rs b/src/abi.rs
index 562e1e9a091..f601cd95f2a 100644
--- a/src/abi.rs
+++ b/src/abi.rs
@@ -153,21 +153,6 @@ impl<'gcc, 'tcx> FnAbiGccExt<'gcc, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
             ty
         };
 
-        #[cfg(feature = "master")]
-        let apply_attrs = |ty: Type<'gcc>, attrs: &ArgAttributes| {
-            if cx.sess().opts.optimize != config::OptLevel::No
-                && attrs.regular.contains(rustc_target::abi::call::ArgAttribute::NoAlias)
-            {
-                ty.make_restrict()
-            } else {
-                ty
-            }
-        };
-        #[cfg(not(feature = "master"))]
-        let apply_attrs = |ty: Type<'gcc>, _attrs: &ArgAttributes| {
-            ty
-        };
-
         for arg in self.args.iter() {
             let arg_ty = match arg.mode {
                 PassMode::Ignore => continue,