Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Unified Diff: src/wasm/module-decoder.cc

Issue 2563613003: Revert of [wasm] Fix location for error in asm.js ToNumber conversion (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/wasm/module-decoder.h ('k') | src/wasm/wasm-module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/wasm/module-decoder.cc
diff --git a/src/wasm/module-decoder.cc b/src/wasm/module-decoder.cc
index b0d2314a3ce8b281f132b36ce250b9bd4b5ed41c..558742f35124baa1fe6b1999848384eceaaed2f8 100644
--- a/src/wasm/module-decoder.cc
+++ b/src/wasm/module-decoder.cc
@@ -1204,7 +1204,7 @@
for (uint32_t i = 0; i < functions_count && decoder.ok(); ++i) {
uint32_t size = decoder.consume_u32v("table size");
if (size == 0) {
- table.push_back(std::vector<AsmJsOffsetEntry>());
+ table.push_back(std::vector<std::pair<int, int>>());
continue;
}
if (!decoder.checkAvailable(size)) {
@@ -1214,17 +1214,12 @@
uint32_t locals_size = decoder.consume_u32("locals size");
int last_byte_offset = locals_size;
int last_asm_position = 0;
- std::vector<AsmJsOffsetEntry> func_asm_offsets;
+ std::vector<std::pair<int, int>> func_asm_offsets;
func_asm_offsets.reserve(size / 4); // conservative estimation
while (decoder.ok() && decoder.pc() < table_end) {
last_byte_offset += decoder.consume_u32v("byte offset delta");
- int call_position =
- last_asm_position + decoder.consume_i32v("call position delta");
- int to_number_position =
- call_position + decoder.consume_i32v("to_number position delta");
- last_asm_position = to_number_position;
- func_asm_offsets.push_back(
- {last_byte_offset, call_position, to_number_position});
+ last_asm_position += decoder.consume_i32v("asm position delta");
+ func_asm_offsets.push_back({last_byte_offset, last_asm_position});
}
if (decoder.pc() != table_end) {
decoder.error("broken asm offset table");
« no previous file with comments | « src/wasm/module-decoder.h ('k') | src/wasm/wasm-module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698