| Index: src/isolate.cc
 | 
| diff --git a/src/isolate.cc b/src/isolate.cc
 | 
| index c235a23439dbc5b44ecd16d3396def081b38b7e4..ad29e52d9df6ffc5754db74f9f1195aafed85beb 100644
 | 
| --- a/src/isolate.cc
 | 
| +++ b/src/isolate.cc
 | 
| @@ -591,16 +591,17 @@ Handle<JSArray> Isolate::CaptureCurrentStackTrace(
 | 
|              // tag.
 | 
|              column_offset += script->column_offset()->value();
 | 
|            }
 | 
| -          SetLocalPropertyNoThrow(stackFrame, column_key,
 | 
| -                                  Handle<Smi>(Smi::FromInt(column_offset + 1)));
 | 
| +          JSObject::SetLocalPropertyNoThrow(
 | 
| +              stackFrame, column_key,
 | 
| +              Handle<Smi>(Smi::FromInt(column_offset + 1)));
 | 
|          }
 | 
| -        SetLocalPropertyNoThrow(stackFrame, line_key,
 | 
| -                                Handle<Smi>(Smi::FromInt(line_number + 1)));
 | 
| +        JSObject::SetLocalPropertyNoThrow(
 | 
| +            stackFrame, line_key, Handle<Smi>(Smi::FromInt(line_number + 1)));
 | 
|        }
 | 
|  
 | 
|        if (options & StackTrace::kScriptName) {
 | 
|          Handle<Object> script_name(script->name(), this);
 | 
| -        SetLocalPropertyNoThrow(stackFrame, script_key, script_name);
 | 
| +        JSObject::SetLocalPropertyNoThrow(stackFrame, script_key, script_name);
 | 
|        }
 | 
|  
 | 
|        if (options & StackTrace::kScriptNameOrSourceURL) {
 | 
| @@ -616,8 +617,8 @@ Handle<JSArray> Isolate::CaptureCurrentStackTrace(
 | 
|          if (caught_exception) {
 | 
|            result = factory()->undefined_value();
 | 
|          }
 | 
| -        SetLocalPropertyNoThrow(stackFrame, script_name_or_source_url_key,
 | 
| -                                result);
 | 
| +        JSObject::SetLocalPropertyNoThrow(
 | 
| +            stackFrame, script_name_or_source_url_key, result);
 | 
|        }
 | 
|  
 | 
|        if (options & StackTrace::kFunctionName) {
 | 
| @@ -625,20 +626,21 @@ Handle<JSArray> Isolate::CaptureCurrentStackTrace(
 | 
|          if (fun_name->ToBoolean()->IsFalse()) {
 | 
|            fun_name = Handle<Object>(fun->shared()->inferred_name(), this);
 | 
|          }
 | 
| -        SetLocalPropertyNoThrow(stackFrame, function_key, fun_name);
 | 
| +        JSObject::SetLocalPropertyNoThrow(stackFrame, function_key, fun_name);
 | 
|        }
 | 
|  
 | 
|        if (options & StackTrace::kIsEval) {
 | 
|          int type = Smi::cast(script->compilation_type())->value();
 | 
|          Handle<Object> is_eval = (type == Script::COMPILATION_TYPE_EVAL) ?
 | 
|              factory()->true_value() : factory()->false_value();
 | 
| -        SetLocalPropertyNoThrow(stackFrame, eval_key, is_eval);
 | 
| +        JSObject::SetLocalPropertyNoThrow(stackFrame, eval_key, is_eval);
 | 
|        }
 | 
|  
 | 
|        if (options & StackTrace::kIsConstructor) {
 | 
|          Handle<Object> is_constructor = (frames[i].is_constructor()) ?
 | 
|              factory()->true_value() : factory()->false_value();
 | 
| -        SetLocalPropertyNoThrow(stackFrame, constructor_key, is_constructor);
 | 
| +        JSObject::SetLocalPropertyNoThrow(
 | 
| +            stackFrame, constructor_key, is_constructor);
 | 
|        }
 | 
|  
 | 
|        FixedArray::cast(stack_trace->elements())->set(frames_seen, *stackFrame);
 | 
| 
 |