Merge branch 'trunk' into refactor-builtin-list-drop

compiler/gen_wasm/src/backend.rs

@@ -2,12 +2,13 @@ use bumpalo::{self, collections::Vec};
 
 use code_builder::Align;
 use roc_collections::all::MutMap;
+use roc_module::low_level::LowLevel;
 use roc_module::symbol::Symbol;
 use roc_mono::ir::{CallType, Expr, JoinPointId, Literal, Proc, Stmt};
 use roc_mono::layout::{Builtin, Layout, LayoutIds};
 
 use crate::layout::WasmLayout;
-use crate::low_level::{build_call_low_level, LowlevelBuildResult};
+use crate::low_level::{decode_low_level, LowlevelBuildResult};
 use crate::storage::{Storage, StoredValue, StoredValueKind};
 use crate::wasm_module::linking::{
     DataSymbol, LinkingSection, RelocationSection, WasmObjectSymbol, WASM_SYM_BINDING_WEAK,
@@ -469,6 +470,11 @@ impl<'a> WasmBackend<'a> {
                 arguments,
             }) => match call_type {
                 CallType::ByName { name: func_sym, .. } => {
+                    // If this function is just a lowlevel wrapper, then inline it
+                    if let Some(lowlevel) = LowLevel::from_inlined_wrapper(*func_sym) {
+                        return self.build_low_level(lowlevel, arguments, wasm_layout);
+                    }
+
                     let mut wasm_args_tmp: Vec<Symbol>;
                     let (wasm_args, has_return_val) = match wasm_layout {
                         WasmLayout::StackMemory { .. } => {
@@ -511,30 +517,9 @@ impl<'a> WasmBackend<'a> {
                 }
 
                 CallType::LowLevel { op: lowlevel, .. } => {
-                    let return_layout = WasmLayout::new(layout);
-                    self.storage.load_symbols(&mut self.code_builder, arguments);
-
-                    let build_result = build_call_low_level(
-                        &mut self.code_builder,
-                        &mut self.storage,
-                        lowlevel,
-                        arguments,
-                        &return_layout,
-                    );
-                    use LowlevelBuildResult::*;
-
-                    match build_result {
-                        Done => Ok(()),
-                        BuiltinCall(name) => {
-                            self.call_imported_builtin(name, arguments, &return_layout);
-                            Ok(())
-                        }
-                        NotImplemented => Err(format!(
-                            "Low level operation {:?} is not yet implemented",
-                            lowlevel
-                        )),
-                    }
+                    self.build_low_level(*lowlevel, arguments, wasm_layout)
                 }
+
                 x => Err(format!("the call type, {:?}, is not yet implemented", x)),
             },
 
@@ -567,6 +552,36 @@ impl<'a> WasmBackend<'a> {
         }
     }
 
+    fn build_low_level(
+        &mut self,
+        lowlevel: LowLevel,
+        arguments: &'a [Symbol],
+        return_layout: WasmLayout,
+    ) -> Result<(), String> {
+        self.storage.load_symbols(&mut self.code_builder, arguments);
+
+        let build_result = decode_low_level(
+            &mut self.code_builder,
+            &mut self.storage,
+            lowlevel,
+            arguments,
+            &return_layout,
+        );
+        use LowlevelBuildResult::*;
+
+        match build_result {
+            Done => Ok(()),
+            BuiltinCall(name) => {
+                self.call_imported_builtin(name, arguments, &return_layout);
+                Ok(())
+            }
+            NotImplemented => Err(format!(
+                "Low level operation {:?} is not yet implemented",
+                lowlevel
+            )),
+        }
+    }
+
     fn load_literal(
         &mut self,
         lit: &Literal<'a>,
@@ -764,14 +779,15 @@ impl<'a> WasmBackend<'a> {
                 };
                 self.module.import.entries.push(import);
 
-                let sym_idx = self.linker_symbols.len() as u32;
+                let sym_idx = self.linker_symbols.len();
                 let sym_info = SymInfo::Function(WasmObjectSymbol::Imported {
                     flags: WASM_SYM_UNDEFINED,
                     index: import_index,
                 });
                 self.linker_symbols.push(sym_info);
+                self.builtin_sym_index_map.insert(name, sym_idx);
 
-                (import_index, sym_idx)
+                (import_index, sym_idx as u32)
             }
         };
         self.code_builder.call(

compiler/gen_wasm/src/low_level.rs

@@ -15,10 +15,10 @@ pub enum LowlevelBuildResult {
     NotImplemented,
 }
 
-pub fn build_call_low_level<'a>(
+pub fn decode_low_level<'a>(
     code_builder: &mut CodeBuilder<'a>,
     storage: &mut Storage<'a>,
-    lowlevel: &LowLevel,
+    lowlevel: LowLevel,
     args: &'a [Symbol],
     ret_layout: &WasmLayout,
 ) -> LowlevelBuildResult {
@@ -129,6 +129,9 @@ pub fn build_call_low_level<'a>(
         NumIsMultipleOf => return NotImplemented,
         NumAbs => match ret_layout.value_type() {
             I32 => {
+                let arg_storage = storage.get(&args[0]).to_owned();
+                storage.ensure_value_has_local(code_builder, args[0], arg_storage);
+                storage.load_symbols(code_builder, args);
                 code_builder.i32_const(0);
                 storage.load_symbols(code_builder, args);
                 code_builder.i32_sub();
@@ -138,6 +141,9 @@ pub fn build_call_low_level<'a>(
                 code_builder.select();
             }
             I64 => {
+                let arg_storage = storage.get(&args[0]).to_owned();
+                storage.ensure_value_has_local(code_builder, args[0], arg_storage);
+                storage.load_symbols(code_builder, args);
                 code_builder.i64_const(0);
                 storage.load_symbols(code_builder, args);
                 code_builder.i64_sub();