Merge #680

680: Fix singlepass error when no function code present r=bjfish a=bjfish Co-authored-by: Brandon Fish <[email protected]> Co-authored-by: Brandon Fish <[email protected]>
wasmerio · Aug 19, 2019 · 6b2cd7e · 6b2cd7e
2 parents 7762a72 + 38b1e3d
commit 6b2cd7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 252 deletions.
diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
@@ -404,22 +404,22 @@ impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, CodegenError>
         mut self,
         _: &ModuleInfo,
     ) -> Result<(X64ExecutionContext, Box<dyn CacheGen>), CodegenError> {
-        let (assembler, breakpoints) = match self.functions.last_mut() {
-            Some(x) => (x.assembler.take().unwrap(), x.breakpoints.take().unwrap()),
-            None => {
-                return Err(CodegenError {
-                    message: "no function",
-                });
-            }
+        let (assembler, function_labels, breakpoints) = match self.functions.last_mut() {
+            Some(x) => (
+                x.assembler.take().unwrap(),
+                x.function_labels.take().unwrap(),
+                x.breakpoints.take().unwrap(),
+            ),
+            None => (
+                self.assembler.take().unwrap(),
+                self.function_labels.take().unwrap(),
+                HashMap::new(),
+            ),
         };
+
         let total_size = assembler.get_offset().0;
         let output = assembler.finalize().unwrap();
 
-        let function_labels = if let Some(x) = self.functions.last() {
-            x.function_labels.as_ref().unwrap()
-        } else {
-            self.function_labels.as_ref().unwrap()
-        };
         let mut out_labels: Vec<FuncPtr> = vec![];
         let mut out_offsets: Vec<AssemblyOffset> = vec![];