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

Unified Diff: src/isolate.cc

Issue 2003483002: Refactor script position calculation (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@20160517_refactor_position_info
Patch Set: Attempt to fix branch dependencies Created 4 years, 7 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/heap-symbols.h ('k') | src/js/messages.js » ('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 9d3511327e63dd8592c2a33f296e6cc0308d748b..de55926997095faec9cfdf9cfefe405ba818166f 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -551,28 +551,17 @@ class CaptureStackTraceHelper {
Handle<Script> script(Script::cast(fun->shared()->script()));
if (!line_key_.is_null()) {
- int script_line_offset = script->line_offset();
- int line_number = Script::GetLineNumber(script, position);
- // line_number is already shifted by the script_line_offset.
- int relative_line_number = line_number - script_line_offset;
- if (!column_key_.is_null() && relative_line_number >= 0) {
- Handle<FixedArray> line_ends(FixedArray::cast(script->line_ends()));
- int start =
- (relative_line_number == 0)
- ? 0
- : Smi::cast(line_ends->get(relative_line_number - 1))->value() +
- 1;
- int column_offset = position - start;
- if (relative_line_number == 0) {
- // For the case where the code is on the same line as the script tag.
- column_offset += script->column_offset();
- }
+ Script::PositionInfo info;
+ bool valid_pos =
+ script->GetPositionInfo(position, &info, Script::WITH_OFFSET);
+
+ if (!column_key_.is_null() && valid_pos) {
JSObject::AddProperty(stack_frame, column_key_,
- handle(Smi::FromInt(column_offset + 1), isolate_),
+ handle(Smi::FromInt(info.column + 1), isolate_),
NONE);
}
JSObject::AddProperty(stack_frame, line_key_,
- handle(Smi::FromInt(line_number + 1), isolate_),
+ handle(Smi::FromInt(info.line + 1), isolate_),
NONE);
}
« no previous file with comments | « src/heap-symbols.h ('k') | src/js/messages.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698