Bug 1488205 - Repurpose the --wasm-gc switch for GC. r=jseward

Lars T Hansen · Lars T Hansen · commit deeddf172131 · 2019-03-01T09:55:31.000+01:00
Differential Revision: https://phabricator.services.mozilla.com/D21692 --HG-- extra : rebase_source : 83d2b48fd76a03a8cf175e5f820b4b33f087e4d2 extra : histedit_source : e90289fdb70c787a90a338a2d64e902f4051b34c
diff --git a/js/public/ContextOptions.h b/js/public/ContextOptions.h
@@ -34,7 +34,7 @@ class JS_PUBLIC_API ContextOptions {
 #ifdef ENABLE_WASM_CRANELIFT
         wasmCranelift_(false),
 #endif
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
         wasmGc_(false),
 #endif
         testWasmAwaitTier2_(false),
@@ -125,7 +125,7 @@ class JS_PUBLIC_API ContextOptions {
     return *this;
   }
 
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   bool wasmGc() const { return wasmGc_; }
   ContextOptions& setWasmGc(bool flag) {
     wasmGc_ = flag;
@@ -216,7 +216,7 @@ class JS_PUBLIC_API ContextOptions {
     setWasm(false);
     setWasmBaseline(false);
     setWasmIon(false);
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
     setWasmGc(false);
 #endif
     setNativeRegExp(false);
@@ -233,7 +233,7 @@ class JS_PUBLIC_API ContextOptions {
 #ifdef ENABLE_WASM_CRANELIFT
   bool wasmCranelift_ : 1;
 #endif
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   bool wasmGc_ : 1;
 #endif
   bool testWasmAwaitTier2_ : 1;
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
@@ -701,11 +701,7 @@ static bool WasmReftypesEnabled(JSContext* cx, unsigned argc, Value* vp) {
 
 static bool WasmGcEnabled(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-#ifdef ENABLE_WASM_GC
-  args.rval().setBoolean(wasm::HasReftypesSupport(cx));
-#else
-  args.rval().setBoolean(false);
-#endif
+  args.rval().setBoolean(wasm::HasGcSupport(cx));
   return true;
 }
 
@@ -6032,15 +6028,15 @@ gc::ZealModeHelpText),
 "This will return true early if compilation isn't two-tiered. "),
 
     JS_FN_HELP("wasmReftypesEnabled", WasmReftypesEnabled, 1, 0,
-"wasmReftypesEnabled(bool)",
+"wasmReftypesEnabled()",
 "  Returns a boolean indicating whether the WebAssembly reftypes proposal is enabled."),
 
     JS_FN_HELP("wasmGcEnabled", WasmGcEnabled, 1, 0,
-"wasmGcEnabled(bool)",
+"wasmGcEnabled()",
 "  Returns a boolean indicating whether the WebAssembly GC types proposal is enabled."),
 
     JS_FN_HELP("wasmDebugSupport", WasmDebugSupport, 1, 0,
-"wasmDebugSupport(bool)",
+"wasmDebugSupport()",
 "  Returns a boolean indicating whether the WebAssembly compilers support debugging."),
 
     JS_FN_HELP("isLazyFunction", IsLazyFunction, 1, 0,
diff --git a/js/src/jit-test/lib/wasm-binary.js b/js/src/jit-test/lib/wasm-binary.js
@@ -109,6 +109,54 @@ const SimdPrefix = 0xfd;
 const ThreadPrefix = 0xfe;
 const MozPrefix = 0xff;
 
+// See WasmConstants.h for documentation.
+// Limit this to a group of 8 per line.
+
+const definedOpcodes =
+    [0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+     0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+     0x10, 0x11,
+     0x1a, 0x1b,
+     0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+     0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+     0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+     0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+     0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+     0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+     0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+     0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+     0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+     0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+     0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+     0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+     0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+     0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+     0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+     0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+     0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+     0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+     0xc0, 0xc1, 0xc2, 0xc3, 0xc4,
+     0xd0, 0xd1, 0xd2,
+     0xf0,
+     0xfc, 0xfe, 0xff ];
+
+const undefinedOpcodes = (function () {
+    let a = [];
+    let j = 0;
+    let i = 0;
+    while (i < 256) {
+        while (definedOpcodes[j] > i)
+            a.push(i++);
+        assertEq(definedOpcodes[j], i);
+        i++;
+        j++;
+    }
+    assertEq(definedOpcodes.length + a.length, 256);
+    return a;
+})();
+
 // Secondary opcode bytes for misc prefix
 const MemoryInitCode = 0x08;    // Pending
 const DataDropCode = 0x09;      // Pending
diff --git a/js/src/jit-test/tests/wasm/binary.js b/js/src/jit-test/tests/wasm/binary.js
@@ -235,8 +235,8 @@ for (var bad of [0xff, 0, 1, 0x3f])
     assertErrorMessage(() => wasmEval(moduleWithSections([sigSection([v2vSig]), declSection([0]), bodySection([funcBody({locals:[], body:[BlockCode, bad, EndCode]})])])), CompileError, /invalid inline block type/);
 
 // Ensure all invalid opcodes rejected
-for (let i = FirstInvalidOpcode; i <= LastInvalidOpcode; i++) {
-    let binary = moduleWithSections([v2vSigSection, declSection([0]), bodySection([funcBody({locals:[], body:[i]})])]);
+for (let op of undefinedOpcodes) {
+    let binary = moduleWithSections([v2vSigSection, declSection([0]), bodySection([funcBody({locals:[], body:[op]})])]);
     assertErrorMessage(() => wasmEval(binary), CompileError, /unrecognized opcode/);
     assertEq(WebAssembly.validate(binary), false);
 }
diff --git a/js/src/jit-test/tests/wasm/gc/directives.txt b/js/src/jit-test/tests/wasm/gc/directives.txt
@@ -1 +1 @@
-|jit-test| test-also=--wasm-gc; test-also=--wasm-gc --wasm-compiler=ion; test-also=--wasm-gc --wasm-compiler=baseline; include:wasm.js
+|jit-test| test-also=--wasm-gc; test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--wasm-gc --wasm-compiler=baseline; include:wasm.js
diff --git a/js/src/jit-test/tests/wasm/gc/disabled-ref.js b/js/src/jit-test/tests/wasm/gc/disabled-ref.js
@@ -2,4 +2,4 @@
 
 wasmCompilationShouldFail(
     wasmTextToBinary(`(module (func (param (ref 0)) (unreachable)))`),
-    /reference types not enabled/);
+    /\(ref T\) types not enabled/);
diff --git a/js/src/jit-test/tests/wasm/gc/ion-and-baseline.js b/js/src/jit-test/tests/wasm/gc/ion-and-baseline.js
@@ -1,4 +1,4 @@
-// |jit-test| skip-if: !wasmReftypesEnabled()
+// |jit-test| skip-if: !wasmGcEnabled()
 
 // Attempt to test intercalls from ion to baseline and back.
 //
@@ -12,17 +12,15 @@
 // Some logging with printf confirms that refmod is baseline-compiled and
 // nonrefmod is ion-compiled at present, with --wasm-gc enabled.
 
-// Ion can't talk about references yet *but* we can call indirect from Ion to a
-// baseline module that has exported a function that accepts or returns anyref,
-// without the caller knowing this or having to declare it.  All such calls
-// should fail in an orderly manner with a type mismatch, at the point of the
-// call.
-
 var refmod = new WebAssembly.Module(wasmTextToBinary(
     `(module
+      (gc_feature_opt_in 3)
       (import $tbl "" "tbl" (table 4 funcref))
       (import $print "" "print" (func (param i32)))
 
+      ;; Just a dummy
+      (type $s (struct (field i32)))
+
       (type $htype (func (param anyref)))
       (type $itype (func (result anyref)))
 
diff --git a/js/src/jit/CompileWrappers.cpp b/js/src/jit/CompileWrappers.cpp
@@ -218,10 +218,6 @@ JitCompileOptions::JitCompileOptions()
     : cloneSingletons_(false),
       profilerSlowAssertionsEnabled_(false),
       offThreadCompilationAvailable_(false)
-#ifdef ENABLE_WASM_REFTYPES
-      ,
-      wasmGcEnabled_(false)
-#endif
 {
 }
 
@@ -231,7 +227,4 @@ JitCompileOptions::JitCompileOptions(JSContext* cx) {
       cx->runtime()->geckoProfiler().enabled() &&
       cx->runtime()->geckoProfiler().slowAssertionsEnabled();
   offThreadCompilationAvailable_ = OffThreadCompilationAvailable(cx);
-#ifdef ENABLE_WASM_REFTYPES
-  wasmGcEnabled_ = wasm::HasReftypesSupport(cx);
-#endif
 }
diff --git a/js/src/jit/CompileWrappers.h b/js/src/jit/CompileWrappers.h
@@ -131,17 +131,10 @@ class JitCompileOptions {
     return offThreadCompilationAvailable_;
   }
 
-#ifdef ENABLE_WASM_REFTYPES
-  bool wasmGcEnabled() const { return wasmGcEnabled_; }
-#endif
-
  private:
   bool cloneSingletons_;
   bool profilerSlowAssertionsEnabled_;
   bool offThreadCompilationAvailable_;
-#ifdef ENABLE_WASM_REFTYPES
-  bool wasmGcEnabled_;
-#endif
 };
 
 }  // namespace jit
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
@@ -494,7 +494,7 @@ static bool enableSharedMemory = SHARED_MEMORY_DEFAULT;
 static bool enableWasmBaseline = false;
 static bool enableWasmIon = false;
 static bool enableWasmCranelift = false;
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
 static bool enableWasmGc = false;
 #endif
 static bool enableWasmVerbose = false;
@@ -9883,7 +9883,7 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
     }
   }
 
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   enableWasmGc = op.getBoolOption("wasm-gc");
 #endif
   enableWasmVerbose = op.getBoolOption("wasm-verbose");
@@ -9902,7 +9902,7 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
 #ifdef ENABLE_WASM_CRANELIFT
       .setWasmCranelift(enableWasmCranelift)
 #endif
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
       .setWasmGc(enableWasmGc)
 #endif
       .setWasmVerbose(enableWasmVerbose)
@@ -10205,7 +10205,7 @@ static void SetWorkerContextOptions(JSContext* cx) {
 #ifdef ENABLE_WASM_CRANELIFT
       .setWasmCranelift(enableWasmCranelift)
 #endif
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
       .setWasmGc(enableWasmGc)
 #endif
       .setWasmVerbose(enableWasmVerbose)
@@ -10590,8 +10590,8 @@ int main(int argc, char** argv, char** envp) {
       !op.addBoolOption('\0', "test-wasm-await-tier2",
                         "Forcibly activate tiering and block "
                         "instantiation on completion of tier2")
-#ifdef ENABLE_WASM_REFTYPES
-      || !op.addBoolOption('\0', "wasm-gc", "Enable wasm GC features")
+#ifdef ENABLE_WASM_GC
+      || !op.addBoolOption('\0', "wasm-gc", "Enable experimental wasm GC features")
 #else
       || !op.addBoolOption('\0', "wasm-gc", "No-op")
 #endif
diff --git a/js/src/wasm/WasmAST.h b/js/src/wasm/WasmAST.h
@@ -1317,7 +1317,7 @@ class AstModule : public AstNode {
   NameVector funcImportNames_;
   AstTableVector tables_;
   AstMemoryVector memories_;
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   uint32_t gcFeatureOptIn_;
 #endif
   Maybe<uint32_t> dataCount_;
@@ -1339,7 +1339,7 @@ class AstModule : public AstNode {
         funcImportNames_(lifo),
         tables_(lifo),
         memories_(lifo),
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
         gcFeatureOptIn_(0),
 #endif
         exports_(lifo),
@@ -1354,7 +1354,7 @@ class AstModule : public AstNode {
   }
   bool hasMemory() const { return !!memories_.length(); }
   const AstMemoryVector& memories() const { return memories_; }
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   bool addGcFeatureOptIn(uint32_t version) {
     gcFeatureOptIn_ = version;
     return true;
diff --git a/js/src/wasm/WasmBaselineCompile.cpp b/js/src/wasm/WasmBaselineCompile.cpp
@@ -11425,15 +11425,9 @@ bool BaseCompiler::emitBody() {
 #endif
 #ifdef ENABLE_WASM_REFTYPES
       case uint16_t(Op::RefNull):
-        if (!env_.gcTypesEnabled()) {
-          return iter_.unrecognizedOpcode(&op);
-        }
         CHECK_NEXT(emitRefNull());
         break;
       case uint16_t(Op::RefIsNull):
-        if (!env_.gcTypesEnabled()) {
-          return iter_.unrecognizedOpcode(&op);
-        }
         CHECK_NEXT(
             emitConversion(emitRefIsNull, ValType::AnyRef, ValType::I32));
         break;
diff --git a/js/src/wasm/WasmCompile.cpp b/js/src/wasm/WasmCompile.cpp
@@ -83,7 +83,7 @@ SharedCompileArgs CompileArgs::build(JSContext* cx,
   bool cranelift = false;
 #endif
 
-#ifdef ENABLE_WASM_REFTYPES
+#ifdef ENABLE_WASM_GC
   bool gc = cx->options().wasmGc();
 #else
   bool gc = false;
@@ -599,8 +599,6 @@ void wasm::CompileTier2(const CompileArgs& args, const Bytes& bytecode,
     return;
   }
 
-  MOZ_ASSERT(!env.gcTypesEnabled(), "can't ion-compile with gc types yet");
-
   ModuleGenerator mg(args, &env, cancelled, &error);
   if (!mg.init()) {
     return;
diff --git a/js/src/wasm/WasmIonCompile.cpp b/js/src/wasm/WasmIonCompile.cpp
@@ -3121,7 +3121,7 @@ static bool EmitMemOrTableInit(FunctionCompiler& f, bool isMem) {
 #endif  // ENABLE_WASM_BULKMEM_OPS
 
 #ifdef ENABLE_WASM_REFTYPES
-// Note, table.{get,grow,set} on table(anyfunc) are currently rejected by the
+// Note, table.{get,grow,set} on table(funcref) are currently rejected by the
 // verifier.
 
 static bool EmitTableGet(FunctionCompiler& f) {
@@ -3798,14 +3798,8 @@ static bool EmitBodyExprs(FunctionCompiler& f) {
 #endif
 #ifdef ENABLE_WASM_REFTYPES
       case uint16_t(Op::RefNull):
-        if (!f.env().gcTypesEnabled()) {
-          return f.iter().unrecognizedOpcode(&op);
-        }
         CHECK(EmitRefNull(f));
       case uint16_t(Op::RefIsNull):
-        if (!f.env().gcTypesEnabled()) {
-          return f.iter().unrecognizedOpcode(&op);
-        }
         CHECK(EmitRefIsNull(f));
 #endif
 
diff --git a/js/src/wasm/WasmJS.cpp b/js/src/wasm/WasmJS.cpp
@@ -65,6 +65,19 @@ bool wasm::HasReftypesSupport(JSContext* cx) {
   }
 #endif
 #ifdef ENABLE_WASM_REFTYPES
+  return true;
+#else
+  return false;
+#endif
+}
+
+bool wasm::HasGcSupport(JSContext* cx) {
+#ifdef ENABLE_WASM_CRANELIFT
+  if (cx->options().wasmCranelift()) {
+    return false;
+  }
+#endif
+#ifdef ENABLE_WASM_GC
   return cx->options().wasmGc() && cx->options().wasmBaseline();
 #else
   return false;
@@ -2356,7 +2369,7 @@ bool WasmTableObject::growImpl(JSContext* cx, const CallArgs& args) {
                           oldLength + delta);
       } else {
         JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                                 JSMSG_WASM_BAD_TBL_GROW_INIT, "anyfunc");
+                                 JSMSG_WASM_BAD_TBL_GROW_INIT, "funcref");
         return false;
       }
       break;
diff --git a/js/src/wasm/WasmJS.h b/js/src/wasm/WasmJS.h
@@ -62,6 +62,11 @@ bool HasCachingSupport(JSContext* cx);
 
 bool HasReftypesSupport(JSContext* cx);
 
+// Returns true if WebAssembly as configured by compile-time flags and run-time
+// options can support (ref T) types and structure types, etc (evolving).
+
+bool HasGcSupport(JSContext* cx);
+
 // Compiles the given binary wasm module given the ArrayBufferObject
 // and links the module's imports with the given import object.
 
diff --git a/js/src/wasm/WasmOpIter.h b/js/src/wasm/WasmOpIter.h
diff --git a/js/src/wasm/WasmTable.h b/js/src/wasm/WasmTable.h
diff --git a/js/src/wasm/WasmTextToBinary.cpp b/js/src/wasm/WasmTextToBinary.cpp
diff --git a/js/src/wasm/WasmTypes.h b/js/src/wasm/WasmTypes.h
diff --git a/js/src/wasm/WasmValidate.cpp b/js/src/wasm/WasmValidate.cpp
diff --git a/js/src/wasm/WasmValidate.h b/js/src/wasm/WasmValidate.h
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\|jit-test\| test-also=--wasm-gc; test-also=--wasm-gc --wasm-compiler=ion; test-also=--wasm-gc --wasm-compiler=baseline; include:wasm.js`
	`1`	`+\|jit-test\| test-also=--wasm-gc; test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--wasm-gc --wasm-compiler=baseline; include:wasm.js`
Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,6 @@ JitCompileOptions::JitCompileOptions()`
`218`	`218`	`: cloneSingletons_(false),`
`219`	`219`	`profilerSlowAssertionsEnabled_(false),`
`220`	`220`	`offThreadCompilationAvailable_(false)`
`221`		`-#ifdef ENABLE_WASM_REFTYPES`
`222`		`- ,`
`223`		`- wasmGcEnabled_(false)`
`224`		`-#endif`
`225`	`221`	`{`
`226`	`222`	`}`
`227`	`223`
`@@ -231,7 +227,4 @@ JitCompileOptions::JitCompileOptions(JSContext* cx) {`
`231`	`227`	`cx->runtime()->geckoProfiler().enabled() &&`
`232`	`228`	`cx->runtime()->geckoProfiler().slowAssertionsEnabled();`
`233`	`229`	`offThreadCompilationAvailable_ = OffThreadCompilationAvailable(cx);`
`234`		`-#ifdef ENABLE_WASM_REFTYPES`
`235`		`- wasmGcEnabled_ = wasm::HasReftypesSupport(cx);`
`236`		`-#endif`
`237`	`230`	`}`