From 3af321a076c1c18c26b2588800a4fdee76392887 Mon Sep 17 00:00:00 2001 From: Volker Berlin Date: Mon, 22 Apr 2019 16:21:02 +0200 Subject: [PATCH] Use a temporary hack for SpiderMonkey WasmTextToBinary --- src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java | 2 +- .../jwebassembly/runtime/ControlFlowOperators.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java index fae4368..465da3c 100644 --- a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java @@ -443,7 +443,7 @@ public class TextModuleWriter extends ModuleWriter { case IF: name = "if"; if( data != ValueType.empty ) { - name += " (result " + data + ")"; + name += spiderMonkey ? " " + data : " (result " + data + ")"; // TODO HACK for https://bugzilla.mozilla.org/show_bug.cgi?id=1545755 } insetAfter++; break; diff --git a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java index 93e1937..a5ff440 100644 --- a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java +++ b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java @@ -60,12 +60,6 @@ public class ControlFlowOperators extends AbstractBaseTest { return list; } - @Test - public void test() { - assumeFalse( getScriptEngine() == ScriptEngine.SpiderMonkeyWat ); // https://bugzilla.mozilla.org/show_bug.cgi?id=1545755 - super.test(); - } - static class TestClass { @Export