Fixes bug with v8::StackTrace for non-zero script line offsets....

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 376 matching lines @@
     Handle<JSObject> stackFrame = Factory::NewJSObject(object_function());
 
     JavaScriptFrame* frame = it.frame();
     JSFunction* fun(JSFunction::cast(frame->function()));
     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);
-
-      if (options & StackTrace::kColumnOffset) {
+      // 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 = (line_number == 0) ?
-            0 : Smi::cast(line_ends->get(line_number - 1))->value() + 1;
+        int start = (relative_line_number == 0) ? 0 :
+            Smi::cast(line_ends->get(relative_line_number - 1))->value() + 1;
         int column_offset = position - start;
-        if (line_number == script_line_offset) {
+        if (relative_line_number == 0) {
           // For the case where the code is on the same line as the script tag.
-          column_offset += script_line_offset;
+          column_offset += script->column_offset()->value();
         }
         SetProperty(stackFrame, column_key,
                     Handle<Smi>(Smi::FromInt(column_offset + 1)), NONE);
       }
-      // Adjust the line_number by the offset in the parent resource.
-      line_number += script_line_offset;
       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::kFunctionName) {
       Handle<Object> fun_name(fun->shared()->name());
-      if (!fun_name->IsString()) {
+      if (fun_name->ToBoolean()->IsFalse()) {
         fun_name = Handle<Object>(fun->shared()->inferred_name());
       }
       SetProperty(stackFrame, function_key, fun_name, NONE);
     }
 
     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();
       SetProperty(stackFrame, eval_key, is_eval, NONE);
@@ skipping 627 matching lines @@
   Top::break_access_->Lock();
 }
 
 
 ExecutionAccess::~ExecutionAccess() {
   Top::break_access_->Unlock();
 }
 
 
 } }  // namespace v8::internal