Merge Debugger and Debug.

src/compiler.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 "v8.h"
 
 #include "compiler.h"
 
 #include "bootstrapper.h"
 #include "codegen.h"
@@ skipping 93 matching lines @@
   for (int i = 0; i < DependentCode::kGroupCount; i++) {
     dependencies_[i] = NULL;
   }
   if (mode == STUB) {
     mode_ = STUB;
     return;
   }
   mode_ = mode;
   abort_due_to_dependency_ = false;
   if (script_->type()->value() == Script::TYPE_NATIVE) MarkAsNative();
-  if (isolate_->debugger()->is_active()) MarkAsDebug();
+  if (isolate_->debug()->is_active()) MarkAsDebug();
 
   if (!shared_info_.is_null()) {
     ASSERT(strict_mode() == SLOPPY);
     SetStrictMode(shared_info_->strict_mode());
   }
   set_bailout_reason(kUnknown);
 
   if (!shared_info().is_null() && shared_info()->is_compiled()) {
     // We should initialize the CompilationInfo feedback vector from the
     // passed in shared info, rather than creating a new one.
@@ skipping 640 matching lines @@
 static Handle<SharedFunctionInfo> CompileToplevel(CompilationInfo* info) {
   Isolate* isolate = info->isolate();
   PostponeInterruptsScope postpone(isolate);
   ASSERT(!isolate->native_context().is_null());
   Handle<Script> script = info->script();
 
   // TODO(svenpanne) Obscure place for this, perhaps move to OnBeforeCompile?
   FixedArray* array = isolate->native_context()->embedder_data();
   script->set_context_data(array->get(0));
 
-  isolate->debugger()->OnBeforeCompile(script);
+  isolate->debug()->OnBeforeCompile(script);
 
   ASSERT(info->is_eval() || info->is_global());
 
   bool parse_allow_lazy =
       (info->cached_data_mode() == CONSUME_CACHED_DATA ||
        String::cast(script->source())->length() > FLAG_min_preparse_length) &&
       !DebuggerWantsEagerCompilation(info);
 
   if (!parse_allow_lazy && info->cached_data_mode() != NO_CACHED_DATA) {
     // We are going to parse eagerly, but we either 1) have cached data produced
@@ skipping 56 matching lines @@
     // property space by setting the expected number of properties for
     // the instances of the function.
     SetExpectedNofPropertiesFromEstimate(result,
                                          lit->expected_property_count());
 
     script->set_compilation_state(Script::COMPILATION_STATE_COMPILED);
 
     live_edit_tracker.RecordFunctionInfo(result, lit, info->zone());
   }
 
-  isolate->debugger()->OnAfterCompile(script, Debugger::NO_AFTER_COMPILE_FLAGS);
+  isolate->debug()->OnAfterCompile(script, Debug::NO_AFTER_COMPILE_FLAGS);
 
   return result;
 }
 
 
 MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
     Handle<String> source,
     Handle<Context> context,
     StrictMode strict_mode,
     ParseRestriction restriction,
@@ skipping 433 matching lines @@
   AllowHandleDereference allow_deref;
   bool tracing_on = info()->IsStub()
       ? FLAG_trace_hydrogen_stubs
       : (FLAG_trace_hydrogen &&
          info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter));
   return (tracing_on &&
       OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
 }
 
 } }  // namespace v8::internal