Debugger: correctly find closure to recompile eval for debugging.

src/debug/debug.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/debug/debug.h"
 
 #include "src/api.h"
 #include "src/arguments.h"
@@ skipping 1510 matching lines @@
     if (start_position == RelocInfo::kNoPosition) {
       start_position = shared->start_position();
     }
 
     if (start_position > target_position_) return;
     if (target_position_ > shared->end_position()) return;
 
     if (current_candidate_ != NULL) {
       if (current_start_position_ == start_position &&
           shared->end_position() == current_candidate_->end_position()) {
+        // If we already have a matching closure, do not throw it away.
+        if (current_candidate_closure_ != NULL && closure == NULL) return;
         // If a top-level function contains only one function
         // declaration the source for the top-level and the function
         // is the same. In that case prefer the non top-level function.
-        if (shared->is_toplevel()) return;
+        if (!current_candidate_->is_toplevel() && shared->is_toplevel()) return;
       } else if (start_position < current_start_position_ ||
                  current_candidate_->end_position() < shared->end_position()) {
         return;
       }
     }
 
     current_start_position_ = start_position;
     current_candidate_ = shared;
     current_candidate_closure_ = closure;
   }
@@ skipping 1258 matching lines @@
 }
 
 
 void LockingCommandMessageQueue::Clear() {
   base::LockGuard<base::Mutex> lock_guard(&mutex_);
   queue_.Clear();
 }
 
 }  // namespace internal
 }  // namespace v8