Code clean-up in src/top.cc

src/top.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 326 matching lines @@
 
 Handle<JSArray> Top::CaptureCurrentStackTrace(
     int frame_limit, StackTrace::StackTraceOptions options) {
   // Ensure no negative values.
   int limit = Max(frame_limit, 0);
   Handle<JSArray> stack_trace = Factory::NewJSArray(frame_limit);
 
   Handle<String> column_key =  Factory::LookupAsciiSymbol("column");
   Handle<String> line_key =  Factory::LookupAsciiSymbol("lineNumber");
   Handle<String> script_key =  Factory::LookupAsciiSymbol("scriptName");
+  Handle<String> name_or_source_url_key =
+      Factory::LookupAsciiSymbol("nameOrSourceURL");
+  Handle<String> script_name_or_source_url_key =
+      Factory::LookupAsciiSymbol("scriptNameOrSourceURL");
   Handle<String> function_key =  Factory::LookupAsciiSymbol("functionName");
   Handle<String> eval_key =  Factory::LookupAsciiSymbol("isEval");
   Handle<String> constructor_key =  Factory::LookupAsciiSymbol("isConstructor");
 
   StackTraceFrameIterator it;
   int frames_seen = 0;
   while (!it.done() && (frames_seen < limit)) {
     // Create a JSObject to hold the information for the StackFrame.
     Handle<JSObject> stackFrame = Factory::NewJSObject(object_function());
 
     JavaScriptFrame* frame = it.frame();
-    JSFunction* fun(JSFunction::cast(frame->function()));
-    Script* script = Script::cast(fun->shared()->script());
+    Handle<JSFunction> fun(JSFunction::cast(frame->function()));
+    Handle<Script> script(Script::cast(fun->shared()->script()));
 
     if (options & StackTrace::kLineNumber) {
       int script_line_offset = script->line_offset()->value();
       int position = frame->code()->SourcePosition(frame->pc());
-      int line_number = GetScriptLineNumber(Handle<Script>(script), position);
+      int line_number = GetScriptLineNumber(script, position);
       // line_number is already shifted by the script_line_offset.
       int relative_line_number = line_number - script_line_offset;
       if (options & StackTrace::kColumnOffset && 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()->value();
         }
         SetProperty(stackFrame, column_key,
                     Handle<Smi>(Smi::FromInt(column_offset + 1)), NONE);
       }
       SetProperty(stackFrame, line_key,
                   Handle<Smi>(Smi::FromInt(line_number + 1)), NONE);
     }
 
     if (options & StackTrace::kScriptName) {
       Handle<Object> script_name(script->name());
       SetProperty(stackFrame, script_key, script_name, NONE);
     }
 
     if (options & StackTrace::kScriptNameOrSourceURL) {
       Handle<Object> script_name(script->name());
-      Handle<String> method_name =
-          Factory::LookupAsciiSymbol("nameOrSourceURL");
-      Handle<JSValue> script_wrapper = GetScriptWrapper(Handle<Script>(script));
-      Handle<Object> property = GetProperty(script_wrapper, method_name);
+      Handle<JSValue> script_wrapper = GetScriptWrapper(script);
+      Handle<Object> property = GetProperty(script_wrapper,
+                                            name_or_source_url_key);
       ASSERT(property->IsJSFunction());
       Handle<JSFunction> method = Handle<JSFunction>::cast(property);
       bool caught_exception;
       Handle<Object> result = Execution::TryCall(method, script_wrapper, 0,
                                                  NULL, &caught_exception);
       if (caught_exception) {
         result = Factory::undefined_value();
       }
-      Handle<String> script_name_or_source_url_key =
-          Factory::LookupAsciiSymbol("scriptNameOrSourceURL");
       SetProperty(stackFrame, script_name_or_source_url_key, result, NONE);
     }
 
     if (options & StackTrace::kFunctionName) {
       Handle<Object> fun_name(fun->shared()->name());
       if (fun_name->ToBoolean()->IsFalse()) {
         fun_name = Handle<Object>(fun->shared()->inferred_name());
       }
       SetProperty(stackFrame, function_key, fun_name, NONE);
     }
@@ skipping 625 matching lines @@
   Top::break_access_->Lock();
 }
 
 
 ExecutionAccess::~ExecutionAccess() {
   Top::break_access_->Unlock();
 }
 
 
 } }  // namespace v8::internal