Add BinaryenModuleParseWithFeatures to C and JS APIs

src/binaryen-c.cpp

@@ -5841,7 +5841,13 @@ void BinaryenModuleSetFeatures(BinaryenModuleRef module,
 //
 
 BinaryenModuleRef BinaryenModuleParse(const char* text) {
+  return BinaryenModuleParseWithFeatures(text, BinaryenFeatureMVP());
+}
+
+BinaryenModuleRef BinaryenModuleParseWithFeatures(const char* text,
+                                                  BinaryenFeatures features) {
   auto* wasm = new Module;
+  wasm->features.features = features;
   auto parsed = WATParser::parseModule(*wasm, text);
   if (auto* err = parsed.getErr()) {
     Fatal() << err->msg << "\n";

src/binaryen-c.h

@@ -3131,9 +3131,13 @@ BINARYEN_API void BinaryenModuleSetFeatures(BinaryenModuleRef module,
 // ========== Module Operations ==========
 //
 
-// Parse a module in s-expression text format
+// Parse a module in s-expression text format, assuming the MVP feature set.
 BINARYEN_API BinaryenModuleRef BinaryenModuleParse(const char* text);
 
+// Parse a module in s-expression text format, enabling the given feature set.
+BINARYEN_API BinaryenModuleRef
+BinaryenModuleParseWithFeatures(const char* text, BinaryenFeatures features);
+
 // Print a module to stdout in s-expression text format. Useful for debugging.
 BINARYEN_API void BinaryenModulePrint(BinaryenModuleRef module);
 

src/js/binaryen.js-post.js

@@ -3391,6 +3391,15 @@ Module['parseText'] = function(text) {
   return wrapModule(ptr);
 };
 
+// Parses text format to a module with the given feature set enabled
+Module['parseTextWithFeatures'] = function(text, features) {
+  const buffer = _malloc(text.length + 1);
+  stringToAscii(text, buffer);
+  const ptr = handleFatalError(() => Module['_BinaryenModuleParseWithFeatures'](buffer, features));
+  _free(buffer);
+  return wrapModule(ptr);
+};
+
 // Gets the currently set optimize level. 0, 1, 2 correspond to -O0, -O1, -O2, etc.
 Module['getOptimizeLevel'] = function() {
   return Module['_BinaryenGetOptimizeLevel']();

test/binaryen.js/errors.js.txt

@@ -1 +1,2 @@
+parsing invalid text...
 success.

test/binaryen.js/kitchen-sink.js

@@ -1130,6 +1130,23 @@ function test_parsing() {
   module2.dispose();
 }
 
+function test_parsing_with_features() {
+  var text = `(module
+    (global $g anyref (ref.null any))
+  )`;
+
+  module = binaryen.parseTextWithFeatures(text, binaryen.Features.All);
+  assert(module.validate());
+  console.log("module loaded from text form with features:");
+  console.log(module.emitText());
+  module.dispose();
+
+  // parse with MVP features, which should fail
+  module = binaryen.parseTextWithFeatures(text, binaryen.Features.MVP);
+  console.log("validation with MVP features: " + module.validate());
+  module.dispose();
+}
+
 function test_internals() {
   console.log('sizeof Literal: ' + binaryen['_BinaryenSizeofLiteral']());
 }
@@ -1294,6 +1311,7 @@ test_binaries_with_features();
 test_interpret();
 test_nonvalid();
 test_parsing();
+test_parsing_with_features();
 test_internals();
 test_for_each();
 test_expression_info();

test/binaryen.js/kitchen-sink.js.txt

@@ -2838,6 +2838,17 @@ module loaded from text form:
  )
 )
 
+module loaded from text form with features:
+(module
+ (global $g anyref (ref.null none))
+)
+
+[wasm-validator error in module] unexpected false: all used types should be allowed, on 
+g
+[wasm-validator error in module] unexpected false: , on 
+g
+global type requires additional features [--enable-reference-types --enable-gc]
+validation with MVP features: 0
 sizeof Literal: 24
 (module
  (type $0 (func))