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

Unified Diff: src/isolate.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/frames.cc ('k') | src/messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 9da3848d3918f4a76e77797121f3daaa6cf29bb5..ffe102d44284e36907a3b80b73fd9d136069ac03 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -523,15 +523,9 @@
// be a wasm object.
DCHECK(wasm::IsWasmInstance(*instance) || instance->IsUndefined(this));
- int flags = 0;
- if (wasm::WasmIsAsmJs(*instance, this)) {
- flags |= FrameArray::kIsAsmJsWasmFrame;
- if (wasm_frame->at_to_number_conversion()) {
- flags |= FrameArray::kAsmJsAtNumberConversion;
- }
- } else {
- flags |= FrameArray::kIsWasmFrame;
- }
+ int flags = wasm::WasmIsAsmJs(*instance, this)
+ ? FrameArray::kIsAsmJsWasmFrame
+ : FrameArray::kIsWasmFrame;
elements =
FrameArray::AppendWasmFrame(elements, instance, wasm_function_index,
@@ -1563,10 +1557,8 @@
int func_index = elements->WasmFunctionIndex(i)->value();
int code_offset = elements->Offset(i)->value();
int byte_pos = elements->Code(i)->SourcePosition(code_offset);
- bool at_to_number_conversion =
- elements->Flags(i)->value() & FrameArray::kAsmJsAtNumberConversion;
int source_pos = WasmCompiledModule::GetAsmJsSourcePosition(
- compiled_module, func_index, byte_pos, at_to_number_conversion);
+ compiled_module, func_index, byte_pos);
Handle<Script> script = compiled_module->script();
*target = MessageLocation(script, source_pos, source_pos + 1);
« no previous file with comments | « src/frames.cc ('k') | src/messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698