/js/src/frontend/Stencil.cpp and one more file have been updated (8f9d8bdc)

[github-actions[bot]]

Files

• /js/src/frontend/Stencil.cpp
• /js/src/vm/BytecodeUtil.cpp

Changesets

• https://hg.mozilla.org/mozilla-central/rev/8f9d8bdcc4cc5efe4791263730871d7190181080 Bug 1835867 - Part 3: Rename gc::InitialHeap to Heap and make it an enum class r=jandem
• https://hg.mozilla.org/mozilla-central/rev/7a8687aa539e745d905eb2ae81fc569f3fdd13d8 Bug 1834809 - Add JS::DecodeStencil with JS::FrontendContext. r=nbp
• https://hg.mozilla.org/mozilla-central/rev/e64f38a183a15cc9c5712d2623a8679a8d739c38 Bug 1834483 - Part 5: Remove NativeStackLimit parameter from private FrontendContext-based compile to module API. r=bthrall
• https://hg.mozilla.org/mozilla-central/rev/54bc516f4981cd1e1b3837203548f69ef8a393db Bug 1834483 - Part 4: Remove NativeStackLimit parameter from private FrontendContext-based compile to global API. r=bthrall
• https://hg.mozilla.org/mozilla-central/rev/3b2a67b67a5f54e55f8c8ca7cf26eb760d031f0d Bug 1835785 - Check for pending OOM from JSONPrinter r=arai

Diffs

/js/src/frontend/Stencil.cpp

--- d85e933ffd605cf38d796294b929a0241ab55d62/js/src/frontend/Stencil.cpp
+++ 8f9d8bdcc4cc5efe4791263730871d7190181080/js/src/frontend/Stencil.cpp
@@ -1823,17 +1823,17 @@ static JSFunction* CreateFunctionFast(JS
       ImmutableScriptFlagsEnum::IsGenerator));
   MOZ_ASSERT(!script.functionFlags.isAsmJSNative());

   FunctionFlags flags = script.functionFlags;
   gc::AllocKind allocKind = flags.isExtended()
                                 ? gc::AllocKind::FUNCTION_EXTENDED
                                 : gc::AllocKind::FUNCTION;

-  JSFunction* fun = JSFunction::create(cx, allocKind, gc::TenuredHeap, shape);
+  JSFunction* fun = JSFunction::create(cx, allocKind, gc::Heap::Tenured, shape);
   if (!fun) {
     return nullptr;
   }

   fun->setArgCount(scriptExtra.nargs);
   fun->setFlags(flags);

   fun->initScript(nullptr);
@@ -5211,18 +5211,18 @@ static already_AddRefed<JS::Stencil> Com
     JS::SourceText<CharT>& srcBuf) {
   ScopeKind scopeKind =
       options.nonSyntacticScope ? ScopeKind::NonSyntactic : ScopeKind::Global;

   AutoReportFrontendContext fc(cx);
   NoScopeBindingCache scopeCache;
   Rooted<CompilationInput> input(cx, CompilationInput(options));
   RefPtr<JS::Stencil> stencil = js::frontend::CompileGlobalScriptToStencil(
-      cx, &fc, cx->stackLimitForCurrentPrincipal(), cx->tempLifoAlloc(),
-      input.get(), &scopeCache, srcBuf, scopeKind);
+      cx, &fc, cx->tempLifoAlloc(), input.get(), &scopeCache, srcBuf,
+      scopeKind);
   if (!stencil) {
     return nullptr;
   }

   // Convert the UniquePtr to a RefPtr and increment the count (to 1).
   return stencil.forget();
 }

@@ -5244,18 +5244,17 @@ static already_AddRefed<JS::Stencil> Com
     JS::SourceText<CharT>& srcBuf) {
   JS::CompileOptions options(cx, optionsInput);
   options.setModule();

   AutoReportFrontendContext fc(cx);
   NoScopeBindingCache scopeCache;
   Rooted<CompilationInput> input(cx, CompilationInput(options));
   RefPtr<JS::Stencil> stencil = js::frontend::ParseModuleToStencil(
-      cx, &fc, cx->stackLimitForCurrentPrincipal(), cx->tempLifoAlloc(),
-      input.get(), &scopeCache, srcBuf);
+      cx, &fc, cx->tempLifoAlloc(), input.get(), &scopeCache, srcBuf);
   if (!stencil) {
     return nullptr;
   }

   // Convert the UniquePtr to a RefPtr and increment the count (to 1).
   return stencil.forget();
 }

@@ -5321,26 +5320,33 @@ JS::TranscodeResult JS::EncodeStencil(JS
   return TranscodeResult::Ok;
 }

 JS::TranscodeResult JS::DecodeStencil(JSContext* cx,
                                       const JS::DecodeOptions& options,
                                       const JS::TranscodeRange& range,
                                       JS::Stencil** stencilOut) {
   AutoReportFrontendContext fc(cx);
-  RefPtr<ScriptSource> source = fc.getAllocator()->new_<ScriptSource>();
+  return JS::DecodeStencil(&fc, options, range, stencilOut);
+}
+
+JS::TranscodeResult JS::DecodeStencil(JS::FrontendContext* fc,
+                                      const JS::DecodeOptions& options,
+                                      const JS::TranscodeRange& range,
+                                      JS::Stencil** stencilOut) {
+  RefPtr<ScriptSource> source = fc->getAllocator()->new_<ScriptSource>();
   if (!source) {
     return TranscodeResult::Throw;
   }
   RefPtr<JS::Stencil> stencil(
-      fc.getAllocator()->new_<CompilationStencil>(source));
+      fc->getAllocator()->new_<CompilationStencil>(source));
   if (!stencil) {
     return TranscodeResult::Throw;
   }
-  XDRStencilDecoder decoder(&fc, range);
+  XDRStencilDecoder decoder(fc, range);
   XDRResult res = decoder.codeStencil(options, *stencil);
   if (res.isErr()) {
     return res.unwrapErr();
   }
   *stencilOut = stencil.forget().take();
   return TranscodeResult::Ok;
 }

/js/src/vm/BytecodeUtil.cpp

--- 416af93c3205460856a2cae7bee084a656ee2ee9/js/src/vm/BytecodeUtil.cpp
+++ 3b2a67b67a5f54e55f8c8ca7cf26eb760d031f0d/js/src/vm/BytecodeUtil.cpp
@@ -2918,17 +2918,17 @@ static bool GetPCCountJSON(JSContext* cx
       ionCounts = ionCounts->previous();
     }

     json.endList();
   }

   json.endObject();

-  return true;
+  return !sp.hadOutOfMemory();
 }

 JSString* JS::GetPCCountScriptContents(JSContext* cx, size_t index) {
   JSRuntime* rt = cx->runtime();

   if (!rt->scriptAndCountsVector ||
       index >= rt->scriptAndCountsVector->length()) {
     JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,