commit f8a8a0b0d43583135cd77b643e498cb6f0ad700a
author Choongwoo Han <cwhan.tunz@gmail.com> Mon Feb 05 16:08:01 2018
committer Commit Bot <commit-bot@chromium.org> Wed Feb 07 15:59:29 2018
tree 8fff1c1f7767445d34280f0fbd76c8270772ac4a
parent 5b300875829dddbd7d5704025d310653d5d536dc

Merged: [wasm] Set wasm_compiled_module for script of deserialized module

Bug: chromium:808980
Change-Id: I7a89c6e30f473821f676fd5771365103072c78f1
Reviewed-on: https://chromium-review.googlesource.com/901306
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51099}(cherry picked from commit 34a8204a1e35acfa3db52d4159a78bb80a2ffa15)

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true

Change-Id: I06e3d1e90b6f133bfa6d4a91caeb0d9fd0a8fc39
Reviewed-on: https://chromium-review.googlesource.com/906709
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/branch-heads/6.5@{#31}
Cr-Branched-From: 73c55f57fe8506011ff854b15026ca765b669700-refs/heads/6.5.254@{#1}
Cr-Branched-From: 594a1a0b6e551397cfdf50870f6230da34db2dc8-refs/heads/master@{#50664}

src/wasm/wasm-serialization.cc

diff --git a/src/wasm/wasm-serialization.cc b/src/wasm/wasm-serialization.cc
index 6b7c68c..4466672 100644
--- a/src/wasm/wasm-serialization.cc
+++ b/src/wasm/wasm-serialization.cc
@@ -738,6 +738,7 @@
       export_wrappers, std::vector<wasm::GlobalHandleAddress>(),
       trap_handler::IsTrapHandlerEnabled());
   compiled_module->OnWasmModuleDecodingComplete(shared);
+  script->set_wasm_compiled_module(*compiled_module);
   NativeModuleDeserializer deserializer(isolate,
                                         compiled_module->GetNativeModule());
   if (!deserializer.Read(data)) return {};

test/mjsunit/regress/wasm/regress-808980.js

diff --git a/test/mjsunit/regress/wasm/regress-808980.js b/test/mjsunit/regress/wasm/regress-808980.js
new file mode 100644
index 0000000..884572b8
--- /dev/null
+++ b/test/mjsunit/regress/wasm/regress-808980.js
@@ -0,0 +1,28 @@
+// Copyright 2018 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --throws
+
+load('test/mjsunit/wasm/wasm-constants.js');
+load('test/mjsunit/wasm/wasm-module-builder.js');
+let kTableSize = 3;
+
+var builder = new WasmModuleBuilder();
+var sig_index1 = builder.addType(kSig_i_v);
+builder.addFunction('main', kSig_i_ii).addBody([
+    kExprGetLocal,
+    0,
+    kExprCallIndirect,
+    sig_index1,
+    kTableZero
+]).exportAs('main');
+builder.setFunctionTableBounds(kTableSize, kTableSize);
+var m1_bytes = builder.toBuffer();
+var m1 = new WebAssembly.Module(m1_bytes);
+
+var serialized_m1 = %SerializeWasmModule(m1);
+var m1_clone = %DeserializeWasmModule(serialized_m1, m1_bytes);
+var i1 = new WebAssembly.Instance(m1_clone);
+
+i1.exports.main(123123);