Merge pull request #196 from alexcrichton/merge

Easy Merge!

Author: alexcrichton

cranelift/assembler-x64/meta/src/instructions/avg.rs

@@ -10,7 +10,5 @@ pub fn list() -> Vec<Inst> {
         // AVX versions
         inst("vpavgb", fmt("B", [w(xmm1), r(xmm2), r(xmm_m128)]), vex(L128)._66()._0f().op(0xE0), _64b | compat | avx),
         inst("vpavgw", fmt("B", [w(xmm1), r(xmm2), r(xmm_m128)]), vex(L128)._66()._0f().op(0xE3), _64b | compat | avx),
-
-
     ]
 }

cranelift/assembler-x64/meta/src/instructions/div.rs

@@ -1,5 +1,5 @@
-use crate::dsl::{Feature::*, Inst, Location::*, VexLength::*, align};
-use crate::dsl::{fmt, implicit, inst, r, rex, rw, vex};
+use crate::dsl::{Feature::*, Inst, Location::*, VexLength::*};
+use crate::dsl::{align, fmt, implicit, inst, r, rex, rw, vex};
 
 #[rustfmt::skip] // Keeps instructions on a single line.
 pub fn list() -> Vec<Inst> {
@@ -19,7 +19,7 @@ pub fn list() -> Vec<Inst> {
         inst("divsd", fmt("A", [rw(xmm1), r(xmm_m64)]), rex([0xF2, 0xF, 0x5E]).r(), _64b | compat | sse2),
         inst("vdivps", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m128)]), vex(L128)._0f().op(0x5E).r(), _64b | compat | avx),
         inst("vdivpd", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m128)]), vex(L128)._66()._0f().op(0x5E).r(), _64b | compat | avx),
-        inst("vdivss", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m32)]), vex(L128)._f3()._0f().op(0x5E).r(), _64b | compat | avx),
-        inst("vdivsd", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m64)]), vex(L128)._f2()._0f().op(0x5E).r(), _64b | compat | avx),
+        inst("vdivss", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m32)]), vex(LIG)._f3()._0f().op(0x5E).r(), _64b | compat | avx),
+        inst("vdivsd", fmt("B", [rw(xmm1), r(xmm2), r(xmm_m64)]), vex(LIG)._f2()._0f().op(0x5E).r(), _64b | compat | avx),
     ]
 }

cranelift/assembler-x64/meta/src/instructions/round.rs

@@ -14,6 +14,5 @@ pub fn list() -> Vec<Inst> {
         inst("vroundps", fmt("RMI", [w(xmm1), r(xmm_m128), r(imm8)]), vex(L128)._66()._0f3a().ib().op(0x08), _64b | compat | avx),
         inst("vroundsd", fmt("RVMI", [w(xmm1), r(xmm2), r(xmm_m64), r(imm8)]), vex(LIG)._66()._0f3a().ib().op(0x0b), _64b | compat | avx),
         inst("vroundss", fmt("RVMI", [w(xmm1), r(xmm2), r(xmm_m32), r(imm8)]), vex(LIG)._66()._0f3a().ib().op(0x0a), _64b | compat | avx),
-
-        ]
+   ]
 }

cranelift/codegen/src/legalizer/mod.rs

@@ -55,8 +55,6 @@ pub fn simple_legalize(func: &mut ir::Function, isa: &dyn TargetIsa) {
     trace!("Pre-legalization function:\n{}", func.display());
 
     let mut pos = FuncCursor::new(func);
-    let func_begin = pos.position();
-    pos.set_position(func_begin);
     while let Some(_block) = pos.next_block() {
         let mut prev_pos = pos.position();
         while let Some(inst) = pos.next_inst() {

cranelift/codegen/src/opts/icmp.isle

@@ -288,5 +288,5 @@
       (slt ty (iconcat $I64 a_lo a_hi) (iconcat $I64 b_lo b_hi)))
 
 
-(rule (simplify (eq cty x (bxor bty x y))) (subsume (eq cty y (iconst_u bty 0))))
-(rule (simplify (ne cty x (bxor bty x y))) (subsume (ne cty y (iconst_u bty 0))))
+(rule (simplify (eq cty x (bxor (ty_int bty) x y))) (subsume (eq cty y (iconst_u bty 0))))
+(rule (simplify (ne cty x (bxor (ty_int bty) x y))) (subsume (ne cty y (iconst_u bty 0))))

cranelift/filetests/filetests/egraph/icmp.clif

@@ -201,3 +201,25 @@ block0(v0: i32, v1: i32):
 ;     v5 = icmp ne v1, v4  ; v4 = 0
 ;     return v5
 ; }
+
+function %issue_10929_no_crash_on_icmp_vectors() -> i32x4 {
+  const0 = 0x40ad3fb47cb16076c8cb1fdd8189d40f
+
+block0():
+  v1 = vconst.i32x4 const0
+  v2 = bxor_not v1, v1
+  v3 = icmp.i32x4 ne v1, v2
+  return v3
+}
+
+; function %issue_10929_no_crash_on_icmp_vectors() -> i32x4 fast {
+;     const0 = 0x40ad3fb47cb16076c8cb1fdd8189d40f
+;
+; block0:
+;     v1 = vconst.i32x4 const0
+;     v4 = bnot v1  ; v1 = const0
+;     v2 = bxor v1, v4  ; v1 = const0
+;     v3 = icmp ne v1, v2  ; v1 = const0
+;     return v3
+; }
+

crates/environ/src/trap_encoding.rs

@@ -99,10 +99,6 @@ pub enum Trap {
     /// Attempt to resume a continuation twice.
     ContinuationAlreadyConsumed,
 
-    /// FIXME(frank-emrich) Only used for stack switching debugging code, to be
-    /// removed from final upstreamed code.
-    DeleteMeDebugAssertion,
-
     /// A Pulley opcode was executed at runtime when the opcode was disabled at
     /// compile time.
     DisabledOpcode,
@@ -150,7 +146,6 @@ impl Trap {
             NoAsyncResult
             UnhandledTag
             ContinuationAlreadyConsumed
-            DeleteMeDebugAssertion
             DisabledOpcode
             AsyncDeadlock
         }
@@ -186,7 +181,6 @@ impl fmt::Display for Trap {
             NoAsyncResult => "async-lifted export failed to produce a result",
             UnhandledTag => "unhandled tag",
             ContinuationAlreadyConsumed => "continuation already consumed",
-            DeleteMeDebugAssertion => "triggered debug assertion",
             DisabledOpcode => "pulley opcode disabled at compile time was executed",
             AsyncDeadlock => "deadlock detected: event loop cannot make further progress",
         };

crates/wasmtime/src/runtime/component/instance.rs

@@ -53,12 +53,7 @@ const _: () = {
 
 impl Instance {
     /// Creates a raw `Instance` from the internal identifiers within the store.
-    ///
-    /// # Safety
-    ///
-    /// The safety of this function relies on `id` belonging to the instance
-    /// within `store`.
-    pub(crate) unsafe fn from_wasmtime(store: &StoreOpaque, id: ComponentInstanceId) -> Instance {
+    pub(crate) fn from_wasmtime(store: &StoreOpaque, id: ComponentInstanceId) -> Instance {
         Instance {
             id: StoreComponentInstanceId::new(store.id(), id),
         }
@@ -1003,10 +998,7 @@ impl<T: 'static> InstancePre<T> {
                 .decrement_component_instance_count();
             e
         })?;
-        // SAFETY: `from_wasmtime` requires that `id` belongs to the store
-        // provided, and it was just inserted above so the condition should be
-        // satisfied.
-        let instance = unsafe { Instance::from_wasmtime(store.0, instantiator.id) };
+        let instance = Instance::from_wasmtime(store.0, instantiator.id);
         store.0.push_component_instance(instance);
         Ok(instance)
     }

crates/wasmtime/src/runtime/externals/global.rs

@@ -305,7 +305,7 @@ impl Global {
         match self.kind {
             VMGlobalKind::Instance(index) => {
                 let instance = InstanceId::from_u32(self.instance);
-                let module = store.instance(instance).module();
+                let module = store.instance(instance).env_module();
                 let index = module.global_index(index);
                 &module.globals[index]
             }
@@ -363,7 +363,7 @@ impl Global {
         match self.kind {
             VMGlobalKind::Instance(index) => {
                 let instance = InstanceId::from_u32(self.instance);
-                store.instance(instance).instance().global_ptr(index)
+                store.instance(instance).global_ptr(index)
             }
             VMGlobalKind::Host(index) => unsafe {
                 NonNull::from(&mut store.host_globals()[index].get().as_mut().global)

crates/wasmtime/src/runtime/instance.rs

@@ -1,7 +1,7 @@
 use crate::linker::{Definition, DefinitionType};
 use crate::prelude::*;
 use crate::runtime::vm::{
-    Imports, ModuleRuntimeInfo, VMFuncRef, VMFunctionImport, VMGlobalImport, VMMemoryImport,
+    self, Imports, ModuleRuntimeInfo, VMFuncRef, VMFunctionImport, VMGlobalImport, VMMemoryImport,
     VMOpaqueContext, VMTableImport, VMTagImport,
 };
 use crate::store::{AllocateInstanceKind, InstanceId, StoreInstanceId, StoreOpaque};
@@ -321,10 +321,8 @@ impl Instance {
             .engine()
             .features()
             .contains(WasmFeatures::BULK_MEMORY);
-        store
-            .instance(id)
-            .clone()
-            .initialize(store, compiled_module.module(), bulk_memory)?;
+
+        vm::initialize_instance(store, id, compiled_module.module(), bulk_memory)?;
 
         Ok((instance, compiled_module.module().start_func))
     }
@@ -338,7 +336,7 @@ impl Instance {
     fn start_raw<T>(&self, store: &mut StoreContextMut<'_, T>, start: FuncIndex) -> Result<()> {
         // If a start function is present, invoke it. Make sure we use all the
         // trap-handling configuration in `store` as well.
-        let instance = &mut store.0[self.id];
+        let instance = self.id.get_mut(store.0);
         let f = instance.get_exported_func(start);
         let caller_vmctx = instance.vmctx();
         unsafe {