Adapt source position recording and fix ScopeIterator.

src/ia32/full-codegen-ia32.cc

 // Copyright 2011 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 331 matching lines @@
     __ bind(&return_label_);
     if (FLAG_trace) {
       __ push(eax);
       __ CallRuntime(Runtime::kTraceExit, 1);
     }
 #ifdef DEBUG
     // Add a label for checking the size of the code used for returning.
     Label check_exit_codesize;
     masm_->bind(&check_exit_codesize);
 #endif
-    SetSourcePosition(function()->end_position() - 1);
+    if (scope()->is_global_scope() || scope()->is_eval_scope()) {
+      // Set the source and statement position to one character past the source
+      // code, so that they definitely are not in the source code range of an
+      // immediate inner scope. For example in
+      //   eval('with ({x:1}) x = 1');
+      // the end position of the function generated for executing the eval code
+      // coincides with the end of the with scope which is the position of
+      // '1'. However for the ScopeIterator we want to have positions for the
+      // return sequence outside of the with scope.
+      SetStatementPosition(function()->end_position());
+      SetSourcePosition(function()->end_position());
+    } else {
+      // Set the statement position of the return sequence to the last character
+      // of the current scope.
+      SetStatementPosition(scope()->end_position() - 1);
+      SetSourcePosition(function()->end_position() - 1);

[Lasse Reichstein, 2011/11/21 10:16:40]

Can't the final character coincide with another scope close, e.g.,
  "with (x) y = z; "
?

[Steven, 2011/11/24 13:23:31]

This is not important anymore. I added special handling of the return sequence
case to the ScopeIterator.
On 2011/11/21 10:16:40, Lasse Reichstein wrote:

+    }
     __ RecordJSReturn();
     // Do not use the leave instruction here because it is too short to
     // patch with the code required by the debugger.
     __ mov(esp, ebp);
     __ pop(ebp);
 
     int arguments_bytes = (info_->scope()->num_parameters() + 1) * kPointerSize;
     __ Ret(arguments_bytes, ecx);
 #ifdef ENABLE_DEBUGGER_SUPPORT
     // Check that the size of the code used for returning is large enough
@@ skipping 3980 matching lines @@
   *context_length = 0;
   return previous_;
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32