Chromium Code Reviews

Unified Diff: src/objects.cc

Issue 1633573002: [interpreter] Fix lookup of overlapping handler ranges. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@local_interpreter-remove-fallback
Patch Set: Rebased. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « no previous file | test/mjsunit/mjsunit.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 6c2ff15bed657f8c1f10abfeee262b638dfac80e..b7f4edceb6f4d4b8942cb67a9546a559aafbfcfd 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -10952,6 +10952,11 @@ Handle<LiteralsArray> LiteralsArray::New(Isolate* isolate,
int HandlerTable::LookupRange(int pc_offset, int* stack_depth_out,
CatchPrediction* prediction_out) {
int innermost_handler = -1, innermost_start = -1;
+#ifdef DEBUG
+ // Assuming that ranges are well nested, we don't need to track the innermost
+ // end offset. This is just to verify that the table is actually well nested.
+ int innermost_end = std::numeric_limits<int>::max();
+#endif
for (int i = 0; i < length(); i += kRangeEntrySize) {
int start_offset = Smi::cast(get(i + kRangeStartIndex))->value();
int end_offset = Smi::cast(get(i + kRangeEndIndex))->value();
@@ -10960,10 +10965,13 @@ int HandlerTable::LookupRange(int pc_offset, int* stack_depth_out,
CatchPrediction prediction = HandlerPredictionField::decode(handler_field);
int stack_depth = Smi::cast(get(i + kRangeDepthIndex))->value();
if (pc_offset > start_offset && pc_offset <= end_offset) {
- DCHECK_NE(start_offset, innermost_start);
if (start_offset < innermost_start) continue;
+ DCHECK_LT(end_offset, innermost_end);
innermost_handler = handler_offset;
innermost_start = start_offset;
+#ifdef DEBUG
+ innermost_end = end_offset;
+#endif
*stack_depth_out = stack_depth;
if (prediction_out) *prediction_out = prediction;
}
« no previous file with comments | « no previous file | test/mjsunit/mjsunit.status » ('j') | no next file with comments »

Powered by Google App Engine