From 04b3ddd34cb1dcccc8325f5089d793a3452bbec3 Mon Sep 17 00:00:00 2001 From: Bradley Morris Date: Wed, 23 Oct 2019 10:12:47 -0400 Subject: [PATCH] Convert usage of Pointer_stringify to UTF8ToString --- src/js/binaryen.js-post.js | 2 +- test/binaryen.js/kitchen-sink.js | 3 +++ test/binaryen.js/kitchen-sink.js.txt | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js index 0da3f2df48b..b4cd5e482ea 100644 --- a/src/js/binaryen.js-post.js +++ b/src/js/binaryen.js-post.js @@ -2315,7 +2315,7 @@ Module['getExpressionInfo'] = function(expr) { return { 'id': id, 'type': type, - 'names': getAllNested(expr, Module['_BinaryenSwitchGetNumNames'], Module['_BinaryenSwitchGetName']).map(Pointer_stringify), + 'names': getAllNested(expr, Module['_BinaryenSwitchGetNumNames'], Module['_BinaryenSwitchGetName']).map(UTF8ToString), 'defaultName': UTF8ToString(Module['_BinaryenSwitchGetDefaultName'](expr)), 'condition': Module['_BinaryenSwitchGetCondition'](expr), 'value': Module['_BinaryenSwitchGetValue'](expr) diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js index 4e40adb1743..29320875515 100644 --- a/test/binaryen.js/kitchen-sink.js +++ b/test/binaryen.js/kitchen-sink.js @@ -947,6 +947,9 @@ function test_expression_info() { // Issue #2392 console.log("getExpressionInfo(memory.grow)=" + JSON.stringify(Binaryen.getExpressionInfo(module.memory.grow(1)))); + // Issue #2396 + console.log("getExpressionInfo(memory.grow)=" + JSON.stringify(Binaryen.getExpressionInfo(module.switch([ "label" ], "label", 0)))); + module.dispose(); } diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt index 1e6a9df9263..f67b7266233 100644 --- a/test/binaryen.js/kitchen-sink.js.txt +++ b/test/binaryen.js/kitchen-sink.js.txt @@ -9721,3 +9721,4 @@ sizeof Literal: 24 ) getExpressionInfo(memory.grow)={"id":20,"type":1,"op":1,"nameOperand":"","operands":[1]} +getExpressionInfo(memory.grow)={"id":5,"type":8,"names":[""],"defaultName":"label","condition":0,"value":0}