1734101 - Encode/decode ScriptSource options

Status: RESOLVED FIXED

(Core :: JavaScript Engine, task, P1)

Description

[Tooru Fujisawa [:arai]]

when decoding Stencil XDR, ScriptSource is initialized from ReadOnlyCompileOptions fields, but those information should be known from the original stencil used while encoding.
to introduce subset of CompileOptions in bug 1726498, we should remove the dependency to ReadOnlyCompileOptions there.

https://searchfox.org/mozilla-central/rev/9bc5dcea99c59dc18eae0de7064131aa20cfbb66/js/src/vm/JSScript.cpp#2212

template <XDRMode mode>
/* static */
XDRResult ScriptSource::XDR(XDRState<mode>* xdr,
                            const ReadOnlyCompileOptions* maybeOptions,
                            RefPtr<ScriptSource>& source) {
  JSContext* cx = xdr->cx();

  if (mode == XDR_DECODE) {
...
    if (!source->initFromOptions(cx, *maybeOptions)) {
      return xdr->fail(JS::TranscodeResult::Throw);
    }

https://searchfox.org/mozilla-central/rev/9bc5dcea99c59dc18eae0de7064131aa20cfbb66/js/src/vm/JSScript.cpp#2321-2359

bool ScriptSource::initFromOptions(JSContext* cx,
                                   const ReadOnlyCompileOptions& options) {
  MOZ_ASSERT(!filename_);
  MOZ_ASSERT(!introducerFilename_);

  mutedErrors_ = options.mutedErrors();

  startLine_ = options.lineno;
  introductionType_ = options.introductionType;
  setIntroductionOffset(options.introductionOffset);
  // The parameterListEnd_ is initialized later by setParameterListEnd, before
  // we expose any scripts that use this ScriptSource to the debugger.

  if (options.hasIntroductionInfo) {
    MOZ_ASSERT(options.introductionType != nullptr);
    const char* filename =
        options.filename() ? options.filename() : "<unknown>";
    UniqueChars formatted = FormatIntroducedFilename(
        cx, filename, options.introductionLineno, options.introductionType);
    if (!formatted) {
      return false;
    }
    if (!setFilename(cx, std::move(formatted))) {
      return false;
    }
  } else if (options.filename()) {
    if (!setFilename(cx, options.filename())) {
      return false;
    }
  }

  if (options.introducerFilename()) {
    if (!setIntroducerFilename(cx, options.introducerFilename())) {
      return false;
    }
  }

  return true;
}

Comment 1

[Tooru Fujisawa [:arai]]

due to ScriptSource.introductionType_ field's "statically allocated C string" requirement, we cannot encode/decode it.
JS::DecodeOptions needs the field.

other fields can be encoded/decoded.

Comment 2

[Tooru Fujisawa [:arai]]

Attachment: Bug 1734101 - Encode/decode more ScriptSource fields. r?tcampbell!

Depends on D128343

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/811bc98b7334
Encode/decode more ScriptSource fields. r=tcampbell

Comment 4

[Norisz Fay [:noriszfay]]

https://hg.mozilla.org/mozilla-central/rev/811bc98b7334