Bug 1845584 - Remove JS::CompilationStorage parameter from JS::Prepar…

…eForInstantiate. r=bthrall Differential Revision: https://phabricator.services.mozilla.com/D184663
dothq · Aug 10, 2023 · 18f30d5 · 18f30d5
1 parent ec821c6
commit 18f30d5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 63 deletions.
diff --git a/js/public/experimental/CompileScript.h b/js/public/experimental/CompileScript.h
@@ -157,8 +157,8 @@ extern JS_PUBLIC_API already_AddRefed<JS::Stencil> CompileModuleScriptToStencil(
     JS::SourceText<char16_t>& srcBuf, JS::CompilationStorage& compileStorage);
 
 extern JS_PUBLIC_API bool PrepareForInstantiate(
-    JS::FrontendContext* fc, JS::CompilationStorage& compileStorage,
-    JS::Stencil& stencil, JS::InstantiationStorage& storage);
+    JS::FrontendContext* fc, JS::Stencil& stencil,
+    JS::InstantiationStorage& storage);
 
 }  // namespace JS
 

diff --git a/js/public/experimental/JSStencil.h b/js/public/experimental/JSStencil.h
@@ -75,8 +75,8 @@ struct InstantiationStorage {
       InstantiationStorage* storage);
 
   friend JS_PUBLIC_API bool PrepareForInstantiate(
-      JS::FrontendContext* fc, JS::CompilationStorage& compileStorage,
-      JS::Stencil& stencil, JS::InstantiationStorage& storage);
+      JS::FrontendContext* fc, JS::Stencil& stencil,
+      JS::InstantiationStorage& storage);
 
   friend struct js::ParseTask;
 

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
@@ -6963,7 +6963,7 @@ static bool CompileToStencil(JSContext* cx, uint32_t argc, Value* vp) {
 
   JS::InstantiationStorage storage;
   if (prepareForInstantiate) {
-    if (!JS::PrepareForInstantiate(&fc, compileStorage, *stencil, storage)) {
+    if (!JS::PrepareForInstantiate(&fc, *stencil, storage)) {
       return false;
     }
   }

diff --git a/js/src/frontend/CompilationStencil.h b/js/src/frontend/CompilationStencil.h
@@ -1252,8 +1252,7 @@ struct CompilationStencil {
       FrontendContext* fc, CompilationAtomCache& atomCache,
       const CompilationStencil& stencil, CompilationGCOutput& gcOutput);
   [[nodiscard]] static bool prepareForInstantiate(
-      FrontendContext* fc, CompilationAtomCache& atomCache,
-      const CompilationStencil& stencil,
+      FrontendContext* fc, const CompilationStencil& stencil,
       PreallocatedCompilationGCOutput& gcOutput);
 
   [[nodiscard]] static bool instantiateStencils(

diff --git a/js/src/frontend/CompileScript.cpp b/js/src/frontend/CompileScript.cpp
@@ -189,28 +189,8 @@ already_AddRefed<JS::Stencil> JS::CompileModuleScriptToStencil(
                                           compileStorage);
 }
 
-#ifdef DEBUG
-// We don't need to worry about GC if the CompilationInput has no GC pointers
-static bool isGCSafe(js::frontend::CompilationInput& input) {
-  bool isGlobalOrModule =
-      input.target == CompilationInput::CompilationTarget::Global ||
-      input.target == CompilationInput::CompilationTarget::Module;
-  bool scopeHasNoGC =
-      input.enclosingScope.isStencil() || input.enclosingScope.isNull();
-  bool scriptHasNoGC =
-      input.lazyOuterScript().isStencil() || input.lazyOuterScript().isNull();
-  bool cacheHasNoGC = input.atomCache.empty();
-
-  return isGlobalOrModule && scopeHasNoGC && scriptHasNoGC && cacheHasNoGC;
-}
-#endif  // DEBUG
-
-bool JS::PrepareForInstantiate(JS::FrontendContext* fc,
-                               JS::CompilationStorage& compileStorage,
-                               JS::Stencil& stencil,
+bool JS::PrepareForInstantiate(JS::FrontendContext* fc, JS::Stencil& stencil,
                                JS::InstantiationStorage& storage) {
-  MOZ_ASSERT(compileStorage.hasInput());
-  MOZ_ASSERT(isGCSafe(compileStorage.getInput()));
   if (!storage.gcOutput_) {
     storage.gcOutput_ =
         fc->getAllocator()
@@ -219,6 +199,6 @@ bool JS::PrepareForInstantiate(JS::FrontendContext* fc,
       return false;
     }
   }
-  return CompilationStencil::prepareForInstantiate(
-      fc, compileStorage.getInput().atomCache, stencil, *storage.gcOutput_);
+  return CompilationStencil::prepareForInstantiate(fc, stencil,
+                                                   *storage.gcOutput_);
 }
diff --git a/js/src/frontend/Stencil.cpp b/js/src/frontend/Stencil.cpp
@@ -2910,15 +2910,10 @@ bool CompilationStencil::prepareForInstantiate(
 
 /* static */
 bool CompilationStencil::prepareForInstantiate(
-    FrontendContext* fc, CompilationAtomCache& atomCache,
-    const CompilationStencil& stencil,
+    FrontendContext* fc, const CompilationStencil& stencil,
     PreallocatedCompilationGCOutput& gcOutput) {
-  if (!gcOutput.allocate(fc, stencil.scriptData.size(),
-                         stencil.scopeData.size())) {
-    return false;
-  }
-
-  return atomCache.allocate(fc, stencil.parserAtomData.size());
+  return gcOutput.allocate(fc, stencil.scriptData.size(),
+                           stencil.scopeData.size());
 }
 
 bool CompilationStencil::serializeStencils(JSContext* cx,

diff --git a/js/src/jsapi-tests/testCompileScript.cpp b/js/src/jsapi-tests/testCompileScript.cpp
@@ -231,8 +231,7 @@ bool testPrepareForInstantiate() {
   CHECK(compileStorage.getInput().atomCache.empty());
 
   JS::InstantiationStorage storage;
-  CHECK(JS::PrepareForInstantiate(fc, compileStorage, *stencil, storage));
-  CHECK(compileStorage.getInput().atomCache.size() == 1);  // 'field'
+  CHECK(JS::PrepareForInstantiate(fc, *stencil, storage));
   CHECK(storage.isValid());
   // TODO storage.gcOutput_ is private, so there isn't a good way to check the
   // scriptData and scopeData capacities

diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
@@ -597,8 +597,7 @@ void CompileToStencilTask<Unit>::parse(FrontendContext* fc) {
   }
 
   if (options.allocateInstantiationStorage) {
-    if (!JS::PrepareForInstantiate(fc, compileStorage_, *stencil_,
-                                   instantiationStorage_)) {
+    if (!JS::PrepareForInstantiate(fc, *stencil_, instantiationStorage_)) {
       stencil_ = nullptr;
     }
   }
@@ -620,8 +619,7 @@ void CompileModuleToStencilTask<Unit>::parse(FrontendContext* fc) {
   }
 
   if (options.allocateInstantiationStorage) {
-    if (!JS::PrepareForInstantiate(fc, compileStorage_, *stencil_,
-                                   instantiationStorage_)) {
+    if (!JS::PrepareForInstantiate(fc, *stencil_, instantiationStorage_)) {
       stencil_ = nullptr;
     }
   }
@@ -637,29 +635,16 @@ DecodeStencilTask::DecodeStencilTask(JSContext* cx,
 }
 
 void DecodeStencilTask::parse(FrontendContext* fc) {
-  if (!compileStorage_.allocateInput(fc, options)) {
-    return;
-  }
-  if (!compileStorage_.getInput().initForGlobal(fc)) {
-    return;
-  }
-
-  stencil_ = fc->getAllocator()->new_<frontend::CompilationStencil>(
-      compileStorage_.getInput().source);
-  if (!stencil_) {
-    return;
-  }
+  JS::DecodeOptions decodeOptions(options);
 
-  bool succeeded = false;
-  (void)stencil_->deserializeStencils(fc, options, range, &succeeded);
-  if (!succeeded) {
-    stencil_ = nullptr;
+  JS::TranscodeResult tr =
+      JS::DecodeStencil(fc, decodeOptions, range, getter_AddRefs(stencil_));
+  if (tr != JS::TranscodeResult::Ok) {
     return;
   }
 
   if (options.allocateInstantiationStorage) {
-    if (!JS::PrepareForInstantiate(fc, compileStorage_, *stencil_,
-                                   instantiationStorage_)) {
+    if (!JS::PrepareForInstantiate(fc, *stencil_, instantiationStorage_)) {
       stencil_ = nullptr;
     }
   }
@@ -1839,7 +1824,6 @@ GlobalHelperThreadState::finishStencilTask(JSContext* cx,
     return nullptr;
   }
 
-  MOZ_ASSERT(parseTask->compileStorage_.hasInput());
   MOZ_ASSERT(parseTask->stencil_.get());
 
   if (storage) {