wasm2js: emit quoted properties for the exports, to support closure compiler (#2043)

Author: kripken

src/emscripten-optimizer/simple_ast.h

@@ -1318,9 +1318,18 @@ struct JSPrinter {
         pretty ? emit(", ") : emit(',');
         newline();
       }
-      const char *str = args[i][0]->getCString();
-      const char *check = str;
       bool needQuote = false;
+      const char *str;
+      if (args[i][0]->isArray()) {
+        assert(args[i][0][0] == STRING);
+        // A quoted string.
+        needQuote = true;
+        str = args[i][0][1]->getCString();
+      } else {
+        // Just a raw string, no quotes.
+        str = args[i][0]->getCString();
+      }
+      const char *check = str;
       while (*check) {
         if (!isalnum(*check) && *check != '_' && *check != '$') {
           needQuote = true;
@@ -1644,6 +1653,12 @@ class ValueBuilder {
                                          .push_back(value));
   }
 
+  static void appendToObjectWithQuotes(Ref array, IString key, Ref value) {
+    assert(array[0] == OBJECT);
+    array[1]->push_back(&makeRawArray(2)->push_back(makeString(key))
+                                         .push_back(value));
+  }
+
   static Ref makeSub(Ref obj, Ref index) {
     return &makeRawArray(2)->push_back(makeRawString(SUB))
                             .push_back(obj)

src/wasm2js.h

@@ -531,7 +531,7 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
   Ref exports = ValueBuilder::makeObject();
   for (auto& export_ : wasm->exports) {
     if (export_->kind == ExternalKind::Function) {
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         exports,
         fromName(export_->name, NameScope::Top),
         ValueBuilder::makeName(fromName(export_->value, NameScope::Top))
@@ -540,11 +540,11 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
     if (export_->kind == ExternalKind::Memory) {
       Ref descs = ValueBuilder::makeObject();
       Ref growDesc = ValueBuilder::makeObject();
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         descs,
         IString("grow"),
         growDesc);
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         growDesc,
         IString("value"),
         ValueBuilder::makeName(WASM_GROW_MEMORY));
@@ -553,11 +553,11 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
       bufferGetter[3]->push_back(ValueBuilder::makeReturn(
         ValueBuilder::makeName(BUFFER)
       ));
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         bufferDesc,
         IString("get"),
         bufferGetter);
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         descs,
         IString("buffer"),
         bufferDesc);
@@ -567,7 +567,7 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
       ValueBuilder::appendToCall(
         memory,
         descs);
-      ValueBuilder::appendToObject(
+      ValueBuilder::appendToObjectWithQuotes(
         exports,
         fromName(export_->name, NameScope::Top),
         memory);

test/wasm2js.asserts.js

@@ -70,9 +70,9 @@ function asmFunc0(global, env, buffer) {
 
  var FUNCTION_TABLE = [];
  return {
-  empty: $0, 
-  add: $1, 
-  div_s: $2
+  "empty": $0, 
+  "add": $1, 
+  "div_s": $2
  };
 }
 

test/wasm2js.traps.js

@@ -70,9 +70,9 @@ function asmFunc0(global, env, buffer) {
 
  var FUNCTION_TABLE = [];
  return {
-  empty: $0, 
-  add: $1, 
-  div_s: $2
+  "empty": $0, 
+  "add": $1, 
+  "div_s": $2
  };
 }
 

test/wasm2js/address.2asm.js

@@ -75,8 +75,8 @@ function asmFunc(global, env, buffer) {
  }
 
  return {
-  good: $0, 
-  bad: $1
+  "good": $0, 
+  "bad": $1
  };
 }
 

test/wasm2js/block.2asm.js

@@ -172,20 +172,20 @@ function asmFunc(global, env, buffer) {
 
  var FUNCTION_TABLE = [];
  return {
-  empty: $1, 
-  singular: $2, 
-  multi: $3, 
-  nested: $4, 
-  deep: $5, 
-  as_unary_operand: $6, 
-  as_binary_operand: $7, 
-  as_test_operand: $8, 
-  as_compare_operand: $9, 
-  break_bare: $10, 
-  break_value: $11, 
-  break_repeated: $12, 
-  break_inner: $13, 
-  effects: $14
+  "empty": $1, 
+  "singular": $2, 
+  "multi": $3, 
+  "nested": $4, 
+  "deep": $5, 
+  "as_unary_operand": $6, 
+  "as_binary_operand": $7, 
+  "as_test_operand": $8, 
+  "as_compare_operand": $9, 
+  "break_bare": $10, 
+  "break_value": $11, 
+  "break_repeated": $12, 
+  "break_inner": $13, 
+  "effects": $14
  };
 }
 

test/wasm2js/br.2asm.js

@@ -669,63 +669,63 @@ function asmFunc(global, env, buffer) {
 
  var FUNCTION_TABLE = [];
  return {
-  type_i32: $1, 
-  type_i64: $2, 
-  type_f32: $3, 
-  type_f64: $4, 
-  type_i32_value: $5, 
-  type_i64_value: legalstub$6, 
-  type_f32_value: legalstub$7, 
-  type_f64_value: $8, 
-  as_block_first: $9, 
-  as_block_mid: $10, 
-  as_block_last: $11, 
-  as_block_value: $12, 
-  as_loop_first: $13, 
-  as_loop_mid: $14, 
-  as_loop_last: $15, 
-  as_br_value: $16, 
-  as_br_if_cond: $17, 
-  as_br_if_value: $18, 
-  as_br_if_value_cond: $19, 
-  as_br_table_index: $20, 
-  as_br_table_value: $21, 
-  as_br_table_value_index: $22, 
-  as_return_value: legalstub$23, 
-  as_if_cond: $24, 
-  as_if_then: $25, 
-  as_if_else: $26, 
-  as_select_first: $27, 
-  as_select_second: $28, 
-  as_select_cond: $29, 
-  as_call_first: $31, 
-  as_call_mid: $32, 
-  as_call_last: $33, 
-  as_call_indirect_func: $34, 
-  as_call_indirect_first: $35, 
-  as_call_indirect_mid: $36, 
-  as_call_indirect_last: $37, 
-  as_local_set_value: $38, 
-  as_load_address: legalstub$39, 
-  as_loadN_address: legalstub$40, 
-  as_store_address: $41, 
-  as_store_value: $42, 
-  as_storeN_address: $43, 
-  as_storeN_value: $44, 
-  as_unary_operand: legalstub$45, 
-  as_binary_left: $46, 
-  as_binary_right: legalstub$47, 
-  as_test_operand: $48, 
-  as_compare_left: $49, 
-  as_compare_right: $50, 
-  as_convert_operand: $51, 
-  as_grow_memory_size: $52, 
-  nested_block_value: $53, 
-  nested_br_value: $54, 
-  nested_br_if_value: $55, 
-  nested_br_if_value_cond: $56, 
-  nested_br_table_value: $57, 
-  nested_br_table_value_index: $58
+  "type_i32": $1, 
+  "type_i64": $2, 
+  "type_f32": $3, 
+  "type_f64": $4, 
+  "type_i32_value": $5, 
+  "type_i64_value": legalstub$6, 
+  "type_f32_value": legalstub$7, 
+  "type_f64_value": $8, 
+  "as_block_first": $9, 
+  "as_block_mid": $10, 
+  "as_block_last": $11, 
+  "as_block_value": $12, 
+  "as_loop_first": $13, 
+  "as_loop_mid": $14, 
+  "as_loop_last": $15, 
+  "as_br_value": $16, 
+  "as_br_if_cond": $17, 
+  "as_br_if_value": $18, 
+  "as_br_if_value_cond": $19, 
+  "as_br_table_index": $20, 
+  "as_br_table_value": $21, 
+  "as_br_table_value_index": $22, 
+  "as_return_value": legalstub$23, 
+  "as_if_cond": $24, 
+  "as_if_then": $25, 
+  "as_if_else": $26, 
+  "as_select_first": $27, 
+  "as_select_second": $28, 
+  "as_select_cond": $29, 
+  "as_call_first": $31, 
+  "as_call_mid": $32, 
+  "as_call_last": $33, 
+  "as_call_indirect_func": $34, 
+  "as_call_indirect_first": $35, 
+  "as_call_indirect_mid": $36, 
+  "as_call_indirect_last": $37, 
+  "as_local_set_value": $38, 
+  "as_load_address": legalstub$39, 
+  "as_loadN_address": legalstub$40, 
+  "as_store_address": $41, 
+  "as_store_value": $42, 
+  "as_storeN_address": $43, 
+  "as_storeN_value": $44, 
+  "as_unary_operand": legalstub$45, 
+  "as_binary_left": $46, 
+  "as_binary_right": legalstub$47, 
+  "as_test_operand": $48, 
+  "as_compare_left": $49, 
+  "as_compare_right": $50, 
+  "as_convert_operand": $51, 
+  "as_grow_memory_size": $52, 
+  "nested_block_value": $53, 
+  "nested_br_value": $54, 
+  "nested_br_if_value": $55, 
+  "nested_br_if_value_cond": $56, 
+  "nested_br_table_value": $57, 
+  "nested_br_table_value_index": $58
  };
 }
 

test/wasm2js/br_if.2asm.js

@@ -258,23 +258,23 @@ function asmFunc(global, env, buffer) {
 
  var FUNCTION_TABLE = [];
  return {
-  as_block_first: $1, 
-  as_block_mid: $2, 
-  as_block_last: $3, 
-  as_block_first_value: $4, 
-  as_block_mid_value: $5, 
-  as_block_last_value: $6, 
-  as_loop_first: $7, 
-  as_loop_mid: $8, 
-  as_loop_last: $9, 
-  as_if_then: $10, 
-  as_if_else: $11, 
-  nested_block_value: $12, 
-  nested_br_value: $13, 
-  nested_br_if_value: $14, 
-  nested_br_if_value_cond: $15, 
-  nested_br_table_value: $16, 
-  nested_br_table_value_index: $17
+  "as_block_first": $1, 
+  "as_block_mid": $2, 
+  "as_block_last": $3, 
+  "as_block_first_value": $4, 
+  "as_block_mid_value": $5, 
+  "as_block_last_value": $6, 
+  "as_loop_first": $7, 
+  "as_loop_mid": $8, 
+  "as_loop_last": $9, 
+  "as_if_then": $10, 
+  "as_if_else": $11, 
+  "nested_block_value": $12, 
+  "nested_br_value": $13, 
+  "nested_br_if_value": $14, 
+  "nested_br_if_value_cond": $15, 
+  "nested_br_table_value": $16, 
+  "nested_br_table_value_index": $17
  };
 }