| Index: src/handles.cc
|
| diff --git a/src/handles.cc b/src/handles.cc
|
| index 7a8d5c90bc5fa97ac289a600ebe0cfc68b243906..35187fa1ba375bdee71a05570093f0c740c123f6 100644
|
| --- a/src/handles.cc
|
| +++ b/src/handles.cc
|
| @@ -457,7 +457,7 @@ Handle<FixedArray> CalculateLineEnds(Handle<String> src,
|
| List<int> line_ends(line_count_estimate);
|
| Isolate* isolate = src->GetIsolate();
|
| {
|
| - AssertNoAllocation no_heap_allocation; // ensure vectors stay valid.
|
| + DisallowHeapAllocation no_allocation; // ensure vectors stay valid.
|
| // Dispatch on type of strings.
|
| String::FlatContent content = src->GetFlatContent();
|
| ASSERT(content.IsFlat());
|
| @@ -485,7 +485,7 @@ Handle<FixedArray> CalculateLineEnds(Handle<String> src,
|
| // Convert code position into line number.
|
| int GetScriptLineNumber(Handle<Script> script, int code_pos) {
|
| InitScriptLineEnds(script);
|
| - AssertNoAllocation no_allocation;
|
| + DisallowHeapAllocation no_allocation;
|
| FixedArray* line_ends_array = FixedArray::cast(script->line_ends());
|
| const int line_ends_len = line_ends_array->length();
|
|
|
| @@ -512,7 +512,7 @@ int GetScriptColumnNumber(Handle<Script> script, int code_pos) {
|
| int line_number = GetScriptLineNumber(script, code_pos);
|
| if (line_number == -1) return -1;
|
|
|
| - AssertNoAllocation no_allocation;
|
| + DisallowHeapAllocation no_allocation;
|
| FixedArray* line_ends_array = FixedArray::cast(script->line_ends());
|
| line_number = line_number - script->line_offset()->value();
|
| if (line_number == 0) return code_pos + script->column_offset()->value();
|
| @@ -522,7 +522,7 @@ int GetScriptColumnNumber(Handle<Script> script, int code_pos) {
|
| }
|
|
|
| int GetScriptLineNumberSafe(Handle<Script> script, int code_pos) {
|
| - AssertNoAllocation no_allocation;
|
| + DisallowHeapAllocation no_allocation;
|
| if (!script->line_ends()->IsUndefined()) {
|
| return GetScriptLineNumber(script, code_pos);
|
| }
|
|
|