From 43adb0418d3c36986abffdd8bd723b318d107793 Mon Sep 17 00:00:00 2001
From: George Karachalias <gdkaracha@gmail.com>
Date: Tue, 1 Sep 2020 16:34:52 +0200
Subject: [PATCH] Fix barf regression (#770)

---
 asterius/src/Asterius/Backends/Binaryen.hs    |  5 +++--
 asterius/src/Asterius/Backends/WasmToolkit.hs | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/asterius/src/Asterius/Backends/Binaryen.hs b/asterius/src/Asterius/Backends/Binaryen.hs
index 4a7cafb7..e0bb98c9 100644
--- a/asterius/src/Asterius/Backends/Binaryen.hs
+++ b/asterius/src/Asterius/Backends/Binaryen.hs
@@ -318,6 +318,7 @@ marshalExpression e = case e of
       Binaryen.switch m nsp (fromIntegral nl) dn c (coerce nullPtr)
   Call {..} -> do
     func_sym_map <- askFunctionsSymbolMap
+    ss_sym_map <- askStaticsSymbolMap
     if
         | target `SM.member` func_sym_map -> do
           os <-
@@ -338,7 +339,7 @@ marshalExpression e = case e of
             (ops, osl) <- marshalV a os
             tp <- marshalBS a (entityName target)
             Binaryen.call m tp ops (fromIntegral osl) rts
-        | ("__asterius_barf_" <> target) `SM.member` func_sym_map ->
+        | ("__asterius_barf_" <> target) `SM.member` ss_sym_map ->
           marshalExpression $
             barf target callReturnTypes
         | otherwise -> do
@@ -523,7 +524,7 @@ marshalExpression e = case e of
                 addInt64
                   (extendUInt32 base)
                   (constI64 $ fromIntegral x + symbolOffset)
-        | ("__asterius_barf_" <> unresolvedSymbol) `SM.member` func_sym_map ->
+        | ("__asterius_barf_" <> unresolvedSymbol) `SM.member` ss_sym_map ->
           marshalExpression $ barf unresolvedSymbol [I64]
         | otherwise ->
           lift $ Binaryen.constInt64 m invalidAddress
diff --git a/asterius/src/Asterius/Backends/WasmToolkit.hs b/asterius/src/Asterius/Backends/WasmToolkit.hs
index 95e07fdc..a1226c7d 100644
--- a/asterius/src/Asterius/Backends/WasmToolkit.hs
+++ b/asterius/src/Asterius/Backends/WasmToolkit.hs
@@ -592,8 +592,8 @@ makeInstructions expr =
               makeInstructions
           pure $ unionManyBags xs `snocBag` Wasm.Call {callFunctionIndex = i}
         _ -> do
-          func_sym_map <- askFunctionsSymbolMap
-          if SM.member ("__asterius_barf_" <> target) func_sym_map
+          ss_sym_map <- askStaticsSymbolMap
+          if SM.member ("__asterius_barf_" <> target) ss_sym_map
             then makeInstructions $ barf target callReturnTypes
             else pure $ unitBag Wasm.Unreachable
     CallImport {..} -> do
@@ -713,7 +713,7 @@ makeInstructions expr =
           Just i -> pure $
             unitBag Wasm.ReturnCall {returnCallFunctionIndex = i}
           _
-            | ("__asterius_barf_" <> returnCallTarget64) `SM.member` func_sym_map ->
+            | ("__asterius_barf_" <> returnCallTarget64) `SM.member` ss_sym_map ->
               makeInstructions $ barf returnCallTarget64 []
             | otherwise ->
               pure $ unitBag Wasm.Unreachable
@@ -731,7 +731,7 @@ makeInstructions expr =
                 valueType = I64
               }
           _
-            | ("__asterius_barf_" <> returnCallTarget64) `SM.member` func_sym_map ->
+            | ("__asterius_barf_" <> returnCallTarget64) `SM.member` ss_sym_map ->
               makeInstructions $ barf returnCallTarget64 []
             | otherwise ->
               pure $ unitBag Wasm.Unreachable
@@ -784,7 +784,7 @@ makeInstructions expr =
                   addInt64
                     (extendUInt32 base)
                     (constI64 $ fromIntegral x + symbolOffset)
-          | ("__asterius_barf_" <> unresolvedSymbol) `SM.member` func_sym_map ->
+          | ("__asterius_barf_" <> unresolvedSymbol) `SM.member` ss_sym_map ->
             makeInstructions $ barf unresolvedSymbol [I64]
           | otherwise ->
             pure $ unitBag Wasm.I64Const