Commit d0c6deb4 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Revert "[wasm] Fix code offset after module cache hit"

This reverts commit c6c86944.

Reason for revert:
https://ci.chromium.org/p/v8/builders/ci/V8%20Blink%20Linux%20Debug/6762
https://test-results.appspot.com/data/layout_results/V8_Blink_Linux_Debug/6762/blink_web_tests%20%28retry%20shards%20with%20patch%29/layout-test-results/results.html

Original change's description:
> [wasm] Fix code offset after module cache hit
>
> If the module cache was hit, we didn't set the code offset in the
> decoded module. Hence it was reported as 0 to the DevTools frontend,
> leading to subsequent errors.
> Note that this error can only happen if multiple isolates share the same
> module, which we cannot easily test in v8. Sharing within a single
> isolate is implemented via the script cache, so we won't report another
> script via CDP.
>
> R=​thibaudm@chromium.org
>
> Bug: chromium:1114143
> Change-Id: I3218a3b12cf5be09d685e3f371f858ab799cef80
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2519560
> Reviewed-by: Thibaud Michaud <thibaudm@chromium.org>
> Commit-Queue: Clemens Backes <clemensb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#70967}

TBR=clemensb@chromium.org,thibaudm@chromium.org

Change-Id: I61528d5000d703ce36ad2ba88cae043220f5f9f5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1114143
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2519569Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70974}
parent f383a923
......@@ -9964,8 +9964,6 @@ int debug::WasmScript::CodeOffset() const {
i::wasm::NativeModule* native_module = script->wasm_native_module();
const i::wasm::WasmModule* module = native_module->module();
// The code offset must have been initialized, and it cannot be zero.
DCHECK_NE(0, module->code.offset());
return module->code.offset();
}
......
......@@ -2479,8 +2479,6 @@ bool AsyncStreamingProcessor::ProcessCodeSectionHeader(
return false;
}
decoder_.set_code_section(offset, static_cast<uint32_t>(code_section_length));
prefix_hash_ = base::hash_combine(prefix_hash_,
static_cast<uint32_t>(code_section_length));
if (!wasm_engine_->GetStreamingCompilationOwnership(prefix_hash_)) {
......@@ -2502,6 +2500,7 @@ bool AsyncStreamingProcessor::ProcessCodeSectionHeader(
job_->DoImmediately<AsyncCompileJob::PrepareAndStartCompile>(
decoder_.shared_module(), false, code_size_estimate);
decoder_.set_code_section(offset, static_cast<uint32_t>(code_section_length));
auto* compilation_state = Impl(job_->native_module_->compilation_state());
compilation_state->SetWireBytesStorage(std::move(wire_bytes_storage));
DCHECK_EQ(job_->native_module_->module()->origin, kWasmOrigin);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment