about summary refs log tree commit diff
path: root/compiler/rustc_codegen_ssa/src
diff options
context:
space:
mode:
authorkadmin <julianknodt@gmail.com>2020-12-29 02:00:04 +0000
committerkadmin <julianknodt@gmail.com>2021-03-09 16:54:14 +0000
commit982382dc0361aa19e2f7e1e2b02003320d34b502 (patch)
treefcdd29dca8dfbc300b4ef2684e9e3d50d81049c7 /compiler/rustc_codegen_ssa/src
parent37a6c04718b9e8577b92aff2ab58a5c69a6c822a (diff)
downloadrust-982382dc0361aa19e2f7e1e2b02003320d34b502.tar.gz
rust-982382dc0361aa19e2f7e1e2b02003320d34b502.zip
Update cranelift
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
-rw-r--r--compiler/rustc_codegen_ssa/src/mir/statement.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/statement.rs b/compiler/rustc_codegen_ssa/src/mir/statement.rs
index 1dafc8cd2c1..774c920ee96 100644
--- a/compiler/rustc_codegen_ssa/src/mir/statement.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/statement.rs
@@ -118,23 +118,22 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             mir::StatementKind::CopyNonOverlapping(box mir::CopyNonOverlapping {
                 ref src,
                 ref dst,
-                ref size,
+                ref count,
             }) => {
                 let dst_val = self.codegen_operand(&mut bx, dst);
                 let src_val = self.codegen_operand(&mut bx, src);
-                let size_val = self.codegen_operand(&mut bx, size);
-                let size = size_val.immediate_or_packed_pair(&mut bx);
+                let count_val = self.codegen_operand(&mut bx, count);
+                let count = count_val.immediate_or_packed_pair(&mut bx);
                 let dst = dst_val.immediate_or_packed_pair(&mut bx);
                 let src = src_val.immediate_or_packed_pair(&mut bx);
                 use crate::MemFlags;
-                let flags =
-                    (!MemFlags::UNALIGNED) & (!MemFlags::VOLATILE) & (!MemFlags::NONTEMPORAL);
+                let flags = MemFlags::empty();
                 bx.memcpy(
                     dst,
                     dst_val.layout.layout.align.pref,
                     src,
                     src_val.layout.layout.align.pref,
-                    size,
+                    count,
                     flags,
                 );
                 bx