tweag/asterius
1
1
Fork 0
mirror of https://github.com/tweag/asterius.git synced 2024-09-19 21:07:55 +03:00
Code Issues Projects Releases Wiki Activity

Fix barf regression (#770)

Browse Source
This commit is contained in:
George Karachalias 2020-09-01 16:34:52 +02:00 committed by GitHub
parent 4c70a0c048
commit 43adb0418d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asterius/src/Asterius/Backends/Binaryen.hs
View File

@ -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

10
asterius/src/Asterius/Backends/WasmToolkit.hs
View File

@ -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