[wat2wasm] Passive segments require bulk memory (#1203)

Author: binji

src/test-wast-parser.cc

@@ -49,7 +49,7 @@ Errors ParseInvalidModule(std::string text) {
 
 TEST(WastParser, LongToken) {
   std::string text;
-  text = "(module (data ";
+  text = "(module (memory ";
   text += repeat("a", 0x5000);
   text += "))";
 
@@ -58,9 +58,9 @@ TEST(WastParser, LongToken) {
 
   ASSERT_EQ(ErrorLevel::Error, errors[0].error_level);
   ASSERT_EQ(1, errors[0].loc.line);
-  ASSERT_EQ(15, errors[0].loc.first_column);
+  ASSERT_EQ(17, errors[0].loc.first_column);
   ASSERT_STREQ(
-      R"(unexpected token aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..., expected ).)",
+      R"(unexpected token "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", expected a natural number (e.g. 123).)",
       errors[0].message.c_str());
 }
 

src/wast-parser.cc

@@ -933,7 +933,12 @@ Result WastParser::ParseDataModuleField(Module* module) {
   } else if (ParseVarOpt(&field->data_segment.memory_var, Var(0, loc))) {
     CHECK_RESULT(ParseOffsetExpr(&field->data_segment.offset));
   } else if (!ParseOffsetExprOpt(&field->data_segment.offset)) {
-    field->data_segment.flags |= SegPassive;
+    if (options_->features.bulk_memory_enabled()) {
+      field->data_segment.flags |= SegPassive;
+    } else {
+      Error(loc, "passive data segments are not allowed");
+      return Result::Error;
+    }
   }
 
   ParseTextListOpt(&field->data_segment.data);
@@ -987,6 +992,7 @@ Result WastParser::ParseElemModuleField(Module* module) {
   }
 
   if (ParseRefTypeOpt(&field->elem_segment.elem_type)) {
+    // TODO: Don't allow unless bulk memory is enabled.
     field->elem_segment.flags |= (SegPassive | SegUseElemExprs);
     // Parse a potentially empty sequence of ElemExprs.
     while (true) {

test/parse/expr/bulk-memory-disabled.txt

@@ -20,6 +20,9 @@
   )
 )
 (;; STDERR ;;;
+out/test/parse/expr/bulk-memory-disabled.txt:6:4: error: passive data segments are not allowed
+  (data $data "a")
+   ^^^^
 out/test/parse/expr/bulk-memory-disabled.txt:8:41: error: opcode not allowed: memory.init
     i32.const 0 i32.const 0 i32.const 0 memory.init 0
                                         ^^^^^^^^^^^

test/parse/module/bad-memory-segment-address.txt

@@ -1,10 +1,11 @@
 ;;; TOOL: wat2wasm
 ;;; ERROR: 1
+;;; ARGS: --enable-bulk-memory
 (module
   (memory 100)
   (data foo))
 (;; STDERR ;;;
-out/test/parse/module/bad-memory-segment-address.txt:5:9: error: unexpected token foo, expected ).
+out/test/parse/module/bad-memory-segment-address.txt:6:9: error: unexpected token foo, expected ).
   (data foo))
         ^^^
 ;;; STDERR ;;)

test/parse/module/memory-segment-passive.txt

@@ -1,4 +1,5 @@
 ;;; TOOL: wat2wasm
+;;; ARGS: --enable-bulk-memory
 (module
   (memory 1)
   (data "hi"))

test/regress/regress-33.txt

@@ -1,11 +1,12 @@
 ;;; TOOL: wat2wasm
 ;;; ERROR: 1
+;;; ARGS: --enable-bulk-memory
 (data "\d")
 (;; STDERR ;;;
-out/test/regress/regress-33.txt:3:8: error: bad escape "\d"
+out/test/regress/regress-33.txt:4:8: error: bad escape "\d"
 (data "\d")
        ^^
-out/test/regress/regress-33.txt:3:7: error: unexpected token Invalid, expected ).
+out/test/regress/regress-33.txt:4:7: error: unexpected token Invalid, expected ).
 (data "\d")
       ^^^^
 ;;; STDERR ;;)

test/regress/regress-36.txt

@@ -0,0 +1,8 @@
+;;; TOOL: wat2wasm
+;;; ERROR: 1
+(data "hello")
+(;; STDERR ;;;
+out/test/regress/regress-36.txt:3:2: error: passive data segments are not allowed
+(data "hello")
+ ^^^^
+;;; STDERR ;;)