Remove Scope::scope_contains_with_ bit

src/debug/debug-scopes.cc

 // Copyright 2015 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/debug/debug-scopes.h"
 
 #include "src/ast/scopes.h"
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/globals.h"
@@ skipping 117 matching lines @@
   Handle<FixedArray> details =
       isolate_->factory()->NewFixedArray(kScopeDetailsSize);
   // Fill in scope details.
   details->set(kScopeDetailsTypeIndex, Smi::FromInt(Type()));
   Handle<JSObject> scope_object;
   ASSIGN_RETURN_ON_EXCEPTION(isolate_, scope_object, ScopeObject(), JSObject);
   details->set(kScopeDetailsObjectIndex, *scope_object);
   Handle<JSFunction> js_function = HasContext()
                                        ? handle(CurrentContext()->closure())
                                        : Handle<JSFunction>::null();
-  if (!js_function.is_null()) {
-    Handle<String> closure_name = JSFunction::GetDebugName(js_function);
-    if (!closure_name.is_null() && (closure_name->length() != 0))
-      details->set(kScopeDetailsNameIndex, *closure_name);
-  }
   if (Type() == ScopeTypeGlobal || Type() == ScopeTypeScript) {
     return isolate_->factory()->NewJSArrayWithElements(details);
   }
 
   int start_position = 0;
   int end_position = 0;
   if (!nested_scope_chain_.is_empty()) {
     js_function = GetFunction();
     start_position = nested_scope_chain_.last().start_position;
     end_position = nested_scope_chain_.last().end_position;
   } else if (!js_function.is_null()) {
     start_position = js_function->shared()->start_position();
     end_position = js_function->shared()->end_position();
   }
 
   if (!js_function.is_null()) {
+    Handle<String> closure_name = JSFunction::GetDebugName(js_function);
+    if (!closure_name.is_null() && closure_name->length() != 0) {
+      details->set(kScopeDetailsNameIndex, *closure_name);
+    }
     details->set(kScopeDetailsStartPositionIndex, Smi::FromInt(start_position));
     details->set(kScopeDetailsEndPositionIndex, Smi::FromInt(end_position));
     details->set(kScopeDetailsFunctionIndex, *js_function);
   }
   return isolate_->factory()->NewJSArrayWithElements(details);
 }
 
 
 void ScopeIterator::Next() {
   DCHECK(!failed_);
@@ skipping 685 matching lines @@
     DCHECK(beg_pos >= 0 && end_pos >= 0);
     if (beg_pos <= position && position < end_pos) {
       GetNestedScopeChain(isolate, inner_scope, position);
       return;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8