Revert "[wasm-debug] Let wasm scripts report correct column information."

This reverts commit 827107a7.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1054664

Original change's description:
> [wasm-debug] Let wasm scripts report correct column information.
>
> In the debugger, wasm scripts currently do not contain meaningful column
> informations. Fix that by keeping track of the offset and size of the
> wasm code section inthe module and reporting that to the debugger.
>
> Bug: chromium:1042636
> Change-Id: Ie2b5d3a50952a467d256f815c16e459cb0ae600e
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2011083
> Commit-Queue: Philip Pfaffe <pfaffe@chromium.org>
> Reviewed-by: Simon Zünd <szuend@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#65913}


Bug: chromium:1042636
Change-Id: Ic59d71111c3274688828bdbf6894f7f3274dc50a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2066983
Commit-Queue: Philip Pfaffe <pfaffe@chromium.org>
Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Simon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#66409}

src/api/api.cc

@@ -9761,26 +9761,6 @@ uint32_t debug::WasmScript::GetFunctionHash(int function_index) {
                                                function_bytes.length(), 0);
 }
 
-int debug::WasmScript::CodeOffset() const {
-  i::DisallowHeapAllocation no_gc;
-  i::Handle<i::Script> script = Utils::OpenHandle(this);
-  DCHECK_EQ(i::Script::TYPE_WASM, script->type());
-  i::wasm::NativeModule* native_module = script->wasm_native_module();
-  const i::wasm::WasmModule* module = native_module->module();
-
-  return module->code.offset();
-}
-
-int debug::WasmScript::CodeLength() const {
-  i::DisallowHeapAllocation no_gc;
-  i::Handle<i::Script> script = Utils::OpenHandle(this);
-  DCHECK_EQ(i::Script::TYPE_WASM, script->type());
-  i::wasm::NativeModule* native_module = script->wasm_native_module();
-  const i::wasm::WasmModule* module = native_module->module();
-
-  return module->code.length();
-}
-
 debug::Location::Location(int line_number, int column_number)
     : line_number_(line_number),
       column_number_(column_number),

src/debug/debug-interface.h

@@ -181,9 +181,6 @@ class WasmScript : public Script {
   int GetContainingFunction(int byte_offset) const;
 
   uint32_t GetFunctionHash(int function_index);
-
-  int CodeOffset() const;
-  int CodeLength() const;
 };
 
 V8_EXPORT_PRIVATE void GetLoadedScripts(

src/inspector/v8-debugger-script.cc

@@ -121,20 +121,9 @@ class ActualScript : public V8DebuggerScript {
     return v8::Just(v8::debug::WasmScript::Cast(*script)->Bytecode());
   }
   int startLine() const override { return m_startLine; }
-  int startColumn() const override {
-    v8::HandleScope scope(m_isolate);
-    auto script = this->script();
-    if (!script->IsWasm()) return m_startColumn;
-    return v8::debug::WasmScript::Cast(*script)->CodeOffset();
-  }
+  int startColumn() const override { return m_startColumn; }
   int endLine() const override { return m_endLine; }
-  int endColumn() const override {
-    v8::HandleScope scope(m_isolate);
-    auto script = this->script();
-    if (!script->IsWasm()) return m_endColumn;
-    return v8::debug::WasmScript::Cast(*script)->CodeOffset() +
-           v8::debug::WasmScript::Cast(*script)->CodeLength();
-  }
+  int endColumn() const override { return m_endColumn; }
   bool isSourceLoadedLazily() const override { return false; }
   int length() const override {
     v8::HandleScope scope(m_isolate);

src/wasm/module-compiler.cc

@@ -2217,7 +2217,6 @@ bool AsyncStreamingProcessor::ProcessCodeSectionHeader(
     std::shared_ptr<WireBytesStorage> wire_bytes_storage,
     int code_section_length) {
   before_code_section_ = false;
-  DCHECK_GE(code_section_length, 0);
   TRACE_STREAMING("Start the code section with %d functions...\n",
                   num_functions);
   if (!decoder_.CheckFunctionsCount(static_cast<uint32_t>(num_functions),
@@ -2246,8 +2245,6 @@ bool AsyncStreamingProcessor::ProcessCodeSectionHeader(
           uses_liftoff);
   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);

src/wasm/module-decoder.cc

@@ -870,8 +870,6 @@ class ModuleDecoderImpl : public Decoder {
       if (failed()) break;
       DecodeFunctionBody(i, size, offset, verify_functions);
     }
-    DCHECK_GE(pc_offset(), pos);
-    set_code_section(pos, pc_offset() - pos);
   }
 
   bool CheckFunctionsCount(uint32_t functions_count, uint32_t offset) {
@@ -1163,10 +1161,6 @@ class ModuleDecoderImpl : public Decoder {
     return result;
   }
 
-  void set_code_section(uint32_t offset, uint32_t size) {
-    module_->code = {offset, size};
-  }
-
   // Decodes an entire module.
   ModuleResult DecodeModule(Counters* counters, AccountingAllocator* allocator,
                             bool verify_functions = true) {
@@ -2026,10 +2020,6 @@ ModuleResult ModuleDecoder::FinishDecoding(bool verify_functions) {
   return impl_->FinishDecoding(verify_functions);
 }
 
-void ModuleDecoder::set_code_section(uint32_t offset, uint32_t size) {
-  return impl_->set_code_section(offset, size);
-}
-
 SectionCode ModuleDecoder::IdentifyUnknownSection(Decoder* decoder,
                                                   const byte* end) {
   WireBytesRef string = consume_string(decoder, true, "section name");

src/wasm/module-decoder.h

@@ -194,8 +194,6 @@ class ModuleDecoder {
 
   ModuleResult FinishDecoding(bool verify_functions = true);
 
-  void set_code_section(uint32_t offset, uint32_t size);
-
   const std::shared_ptr<WasmModule>& shared_module() const;
   WasmModule* module() const { return shared_module().get(); }
 

src/wasm/wasm-module.h

@@ -250,7 +250,6 @@ struct V8_EXPORT_PRIVATE WasmModule {
   uint32_t num_declared_functions = 0;  // excluding imported
   uint32_t num_exported_functions = 0;
   uint32_t num_declared_data_segments = 0;  // From the DataCount section.
-  WireBytesRef code = {0, 0};
   WireBytesRef name = {0, 0};
   std::vector<FunctionSig*> signatures;  // by signature index
   std::vector<uint32_t> signature_ids;   // by signature index

test/cctest/wasm/test-streaming-compilation.cc

@@ -1215,41 +1215,6 @@ STREAM_TEST(TestCompileErrorFunctionName) {
   }
 }
 
-STREAM_TEST(TestSetModuleCodeSection) {
-  StreamTester tester;
-
-  uint8_t code[] = {
-      U32V_1(4),                  // body size
-      U32V_1(0),                  // locals count
-      kExprLocalGet, 0, kExprEnd  // body
-  };
-
-  const uint8_t bytes[] = {
-      WASM_MODULE_HEADER,                   // module header
-      kTypeSectionCode,                     // section code
-      U32V_1(1 + SIZEOF_SIG_ENTRY_x_x),     // section size
-      U32V_1(1),                            // type count
-      SIG_ENTRY_x_x(kLocalI32, kLocalI32),  // signature entry
-      kFunctionSectionCode,                 // section code
-      U32V_1(1 + 1),                        // section size
-      U32V_1(1),                            // functions count
-      0,                                    // signature index
-      kCodeSectionCode,                     // section code
-      U32V_1(1 + arraysize(code) * 1),      // section size
-      U32V_1(1),                            // functions count
-  };
-
-  tester.OnBytesReceived(bytes, arraysize(bytes));
-  tester.OnBytesReceived(code, arraysize(code));
-  tester.FinishStream();
-  tester.RunCompilerTasks();
-  CHECK_EQ(tester.native_module()->module()->code.offset(),
-           arraysize(bytes) - 1);
-  CHECK_EQ(tester.native_module()->module()->code.length(),
-           arraysize(code) + 1);
-  CHECK(tester.IsPromiseFulfilled());
-}
-
 #undef STREAM_TEST
 
 }  // namespace wasm

test/inspector/debugger/wasm-scripts-expected.txt

 Tests how wasm scripts are reported
 Check that each inspector gets a wasm script at module creation time.
-Session #1: Script #0 parsed. URL: wasm://wasm/7b04570e. Source map URL: , code begin: 34, code end: 48
-Session #2: Script #0 parsed. URL: wasm://wasm/7b04570e. Source map URL: , code begin: 34, code end: 48
-Session #1: Script #1 parsed. URL: wasm://wasm/ba7c35be. Source map URL: wasm://dwarf, code begin: 34, code end: 48
-Session #2: Script #1 parsed. URL: wasm://wasm/ba7c35be. Source map URL: wasm://dwarf, code begin: 34, code end: 48
-Session #1: Script #2 parsed. URL: wasm://wasm/1baa71fe. Source map URL: abc, code begin: 34, code end: 48
-Session #2: Script #2 parsed. URL: wasm://wasm/1baa71fe. Source map URL: abc, code begin: 34, code end: 48
-Session #1: Script #3 parsed. URL: wasm://wasm/95e97206. Source map URL: abc, code begin: 34, code end: 48
-Session #2: Script #3 parsed. URL: wasm://wasm/95e97206. Source map URL: abc, code begin: 34, code end: 48
-Session #1: Script #4 parsed. URL: wasm://wasm/7ab47392. Source map URL: abc, code begin: 34, code end: 48
-Session #2: Script #4 parsed. URL: wasm://wasm/7ab47392. Source map URL: abc, code begin: 34, code end: 48
+Session #1: Script #0 parsed. URL: wasm://wasm/7b04570e. Source map URL:
+Session #2: Script #0 parsed. URL: wasm://wasm/7b04570e. Source map URL:
+Session #1: Script #1 parsed. URL: wasm://wasm/ba7c35be. Source map URL: wasm://dwarf
+Session #2: Script #1 parsed. URL: wasm://wasm/ba7c35be. Source map URL: wasm://dwarf
+Session #1: Script #2 parsed. URL: wasm://wasm/1baa71fe. Source map URL: abc
+Session #2: Script #2 parsed. URL: wasm://wasm/1baa71fe. Source map URL: abc
+Session #1: Script #3 parsed. URL: wasm://wasm/95e97206. Source map URL: abc
+Session #2: Script #3 parsed. URL: wasm://wasm/95e97206. Source map URL: abc
+Session #1: Script #4 parsed. URL: wasm://wasm/7ab47392. Source map URL: abc
+Session #2: Script #4 parsed. URL: wasm://wasm/7ab47392. Source map URL: abc
 Session #1: Source for wasm://wasm/7b04570e:
 Raw: 00 61 73 6d 01 00 00 00 01 07 02 60 00 00 60 00 00 03 03 02 00 01 07 08 01 04 6d 61 69 6e 00 01 0a 0e 02 03 00 01 0b 08 00 02 40 41 02 1a 0b 0b 00 1b 04 6e 61 6d 65 01 14 02 00 0b 6e 6f 70 46 75 6e 63 74 69 6f 6e 01 04 6d 61 69 6e
 Imports: []

test/inspector/debugger/wasm-scripts.js

@@ -85,13 +85,9 @@ function trackScripts(debuggerParams) {
   Protocol.Debugger.enable(debuggerParams);
   Protocol.Debugger.onScriptParsed(handleScriptParsed);
 
-  async function loadScript(
-      {url, scriptId, sourceMapURL, startColumn, endColumn}) {
-    InspectorTest.log(`Session #${sessionId}: Script #${
-        scripts.length} parsed. URL: ${url}. Source map URL: ${
-        sourceMapURL}, code begin: ${startColumn}, code end: ${endColumn}`);
-    let {result: {scriptSource, bytecode}} =
-        await Protocol.Debugger.getScriptSource({scriptId});
+  async function loadScript({url, scriptId, sourceMapURL}) {
+    InspectorTest.log(`Session #${sessionId}: Script #${scripts.length} parsed. URL: ${url}. Source map URL: ${sourceMapURL}`);
+    let {result: {scriptSource, bytecode}} = await Protocol.Debugger.getScriptSource({scriptId});
     if (bytecode) {
       if (scriptSource) {
         InspectorTest.log('Unexpected scriptSource with bytecode: ');
@@ -101,17 +97,10 @@ function trackScripts(debuggerParams) {
       bytecode = InspectorTest.decodeBase64(bytecode);
       // Check that it can be parsed back to a WebAssembly module.
       let module = new WebAssembly.Module(bytecode);
-      scriptSource =
-          `
+      scriptSource = `
 Raw: ${Array.from(bytecode, b => ('0' + b.toString(16)).slice(-2)).join(' ')}
-Imports: [${
-              WebAssembly.Module.imports(module)
-                  .map(i => `${i.name}: ${i.kind} from "${i.module}"`)
-                  .join(', ')}]
-Exports: [${
-              WebAssembly.Module.exports(module)
-                  .map(e => `${e.name}: ${e.kind}`)
-                  .join(', ')}]
+Imports: [${WebAssembly.Module.imports(module).map(i => `${i.name}: ${i.kind} from "${i.module}"`).join(', ')}]
+Exports: [${WebAssembly.Module.exports(module).map(e => `${e.name}: ${e.kind}`).join(', ')}]
       `.trim();
     }
     InspectorTest.log(`Session #${sessionId}: Source for ${url}:`);