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

Unified Diff: src/frames.cc

Issue 1670983003: [interpreter] Rename HandlerTable::depth field. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@local_interpreter-test-enable
Patch Set: Rebased. Created 4 years, 10 months 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/full-codegen/full-codegen.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 2c03e9dab07659d0616b7f0046f0e7354ca93773..a57d28bde6c454562dd07e2df0ca6095a36c9940 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -808,14 +808,13 @@ void JavaScriptFrame::Summarize(List<FrameSummary>* functions) {
functions->Add(summary);
}
-
int JavaScriptFrame::LookupExceptionHandlerInTable(
- int* stack_slots, HandlerTable::CatchPrediction* prediction) {
+ int* stack_depth, HandlerTable::CatchPrediction* prediction) {
Code* code = LookupCode();
DCHECK(!code->is_optimized_code());
HandlerTable* table = HandlerTable::cast(code->handler_table());
int pc_offset = static_cast<int>(pc() - code->entry());
- return table->LookupRange(pc_offset, stack_slots, prediction);
+ return table->LookupRange(pc_offset, stack_depth, prediction);
}
@@ -1042,7 +1041,7 @@ int OptimizedFrame::LookupExceptionHandlerInTable(
DCHECK(code->is_optimized_code());
HandlerTable* table = HandlerTable::cast(code->handler_table());
int pc_offset = static_cast<int>(pc() - code->entry());
- *stack_slots = code->stack_slots();
+ if (stack_slots) *stack_slots = code->stack_slots();
return table->LookupReturn(pc_offset, prediction);
}
@@ -1135,13 +1134,12 @@ Object* OptimizedFrame::StackSlotAt(int index) const {
return Memory::Object_at(fp() + StackSlotOffsetRelativeToFp(index));
}
-
int InterpretedFrame::LookupExceptionHandlerInTable(
- int* stack_slots, HandlerTable::CatchPrediction* prediction) {
+ int* context_register, HandlerTable::CatchPrediction* prediction) {
BytecodeArray* bytecode = function()->shared()->bytecode_array();
HandlerTable* table = HandlerTable::cast(bytecode->handler_table());
int pc_offset = GetBytecodeOffset() + 1; // Point after current bytecode.
- return table->LookupRange(pc_offset, stack_slots, prediction);
+ return table->LookupRange(pc_offset, context_register, prediction);
}
« no previous file with comments | « src/frames.h ('k') | src/full-codegen/full-codegen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698