diff options
| author | Brad Morris <bradley.morris@sas.com> | 2019-10-23 13:32:49 -0400 |
|---|---|---|
| committer | Alon Zakai <azakai@google.com> | 2019-10-23 10:32:49 -0700 |
| commit | 760904ab458aa73d97fe4bea848caf8070c56571 (patch) | |
| tree | b5170dea76a06bcbaf8e92d4b60d5c00443c541d | |
| parent | 8a149bbc96e478a13cf93fa5881c754b1076ddba (diff) | |
| download | binaryen-760904ab458aa73d97fe4bea848caf8070c56571.tar.gz binaryen-760904ab458aa73d97fe4bea848caf8070c56571.tar.bz2 binaryen-760904ab458aa73d97fe4bea848caf8070c56571.zip | |
Convert usage of Pointer_stringify to UTF8ToString (#2403)
This fixes #2396. This converts the use of the old Pointer_stringify to the new
UTF8ToString. Added a js test in kitchen-sink.js to cover this.
| -rw-r--r-- | src/js/binaryen.js-post.js | 2 | ||||
| -rw-r--r-- | test/binaryen.js/kitchen-sink.js | 3 | ||||
| -rw-r--r-- | test/binaryen.js/kitchen-sink.js.txt | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js index 0da3f2df4..b4cd5e482 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 4e40adb17..293208755 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 1e6a9df92..f67b72662 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} |