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

Unified Diff: src/frames.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.h ('k') | src/isolate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index ff9ca9dd601b496e812fc2bb9d63c77570a9206f..f34c07ab09c292c1888dc09728ea48a183627604 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -1580,18 +1580,9 @@
isolate());
DCHECK_LE(0, position);
position = WasmCompiledModule::GetAsmJsSourcePosition(
- compiled_module, function_index(), static_cast<uint32_t>(position),
- at_to_number_conversion());
+ compiled_module, function_index(), static_cast<uint32_t>(position));
}
return position;
-}
-
-bool WasmFrame::at_to_number_conversion() const {
- // WasmToJsFrame::ComputeCallerState encoded this for us in the constant pool
- // address. If there was no WasmToJsFrame above us, we just return false here,
- // but this information is not relevant in this case anyway.
- intptr_t addr_int = reinterpret_cast<intptr_t>(constant_pool_address());
- return addr_int == 1;
}
int WasmFrame::LookupExceptionHandlerInTable(int* stack_slots) {
@@ -1601,20 +1592,6 @@
int pc_offset = static_cast<int>(pc() - code->entry());
*stack_slots = code->stack_slots();
return table->LookupReturn(pc_offset);
-}
-
-void WasmToJsFrame::ComputeCallerState(State* state) const {
- // Remember at which of the two calls inside it we are, and transfer this
- // information to the subsequent WASM frame.
- Code* code = unchecked_code();
- AbstractCode* abstract_code = AbstractCode::cast(code);
- int offset = static_cast<int>(pc() - code->instruction_start());
- int at_to_number_call = abstract_code->SourcePosition(offset);
- DCHECK(at_to_number_call == 0 || at_to_number_call == 1);
- StubFrame::ComputeCallerState(state);
- // Use a little hack here: The constant pool address is not used for wasm
- // frames, so use it to encode whether we are at the to_number call.
- state->constant_pool_address = reinterpret_cast<Address*>(at_to_number_call);
}
namespace {
« no previous file with comments | « src/frames.h ('k') | src/isolate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698