Revision: 7681
Author: [email protected]
Date: Tue Apr 26 06:53:19 2011
Log: Fix compilation with debuggersupport=off.
Review URL: http://codereview.chromium.org/6901026
http://code.google.com/p/v8/source/detail?r=7681
Added:
/branches/bleeding_edge/src/isolate-inl.h
Modified:
/branches/bleeding_edge/src/compiler.cc
/branches/bleeding_edge/src/isolate.cc
/branches/bleeding_edge/src/isolate.h
/branches/bleeding_edge/src/liveedit.cc
/branches/bleeding_edge/src/objects-printer.cc
/branches/bleeding_edge/src/runtime-profiler.cc
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/v8.h
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/isolate-inl.h Tue Apr 26 06:53:19 2011
@@ -0,0 +1,50 @@
+// 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
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef V8_ISOLATE_INL_H_
+#define V8_ISOLATE_INL_H_
+
+#include "isolate.h"
+
+#include "debug.h"
+
+namespace v8 {
+namespace internal {
+
+
+bool Isolate::DebuggerHasBreakPoints() {
+#ifdef ENABLE_DEBUGGER_SUPPORT
+ return debug()->has_break_points();
+#else
+ return false;
+#endif
+}
+
+
+} } // namespace v8::internal
+
+#endif // V8_ISOLATE_INL_H_
=======================================
--- /branches/bleeding_edge/src/compiler.cc Thu Apr 21 23:40:22 2011
+++ /branches/bleeding_edge/src/compiler.cc Tue Apr 26 06:53:19 2011
@@ -664,7 +664,7 @@
// version of the function right away - unless the debugger is
// active as it makes no sense to compile optimized code then.
if (FLAG_always_opt &&
- !Isolate::Current()->debug()->has_break_points()) {
+ !Isolate::Current()->DebuggerHasBreakPoints()) {
CompilationInfo optimized(function);
optimized.SetOptimizing(AstNode::kNoNumber);
return CompileLazy(&optimized);
=======================================
--- /branches/bleeding_edge/src/isolate.cc Tue Apr 12 01:27:38 2011
+++ /branches/bleeding_edge/src/isolate.cc Tue Apr 26 06:53:19 2011
@@ -327,10 +327,12 @@
}
+#ifdef ENABLE_DEBUGGER_SUPPORT
Debugger* Isolate::GetDefaultIsolateDebugger() {
EnsureDefaultIsolate();
return default_isolate_->debugger();
}
+#endif
StackGuard* Isolate::GetDefaultIsolateStackGuard() {
=======================================
--- /branches/bleeding_edge/src/isolate.h Fri Apr 15 13:47:27 2011
+++ /branches/bleeding_edge/src/isolate.h Tue Apr 26 06:53:19 2011
@@ -294,7 +294,6 @@
#ifdef ENABLE_DEBUGGER_SUPPORT
#define
ISOLATE_DEBUGGER_INIT_LIST(V) \
- V(uint64_t, enabled_cpu_features,
0) \
V(v8::Debug::EventCallback, debug_event_callback,
NULL) \
V(DebuggerAgent*, debugger_agent_instance, NULL)
#else
@@ -370,6 +369,7 @@
V(unsigned, ast_node_count,
0) \
/* SafeStackFrameIterator activations count.
*/ \
V(int, safe_stack_iterator_counter,
0) \
+ V(uint64_t, enabled_cpu_features,
0) \
ISOLATE_PLATFORM_INIT_LIST(V)
\
ISOLATE_LOGGING_INIT_LIST(V)
\
ISOLATE_DEBUGGER_INIT_LIST(V)
@@ -486,9 +486,11 @@
// Safe to call multiple times.
static void EnsureDefaultIsolate();
+#ifdef ENABLE_DEBUGGER_SUPPORT
// Get the debugger from the default isolate. Preinitializes the
// default isolate if needed.
static Debugger* GetDefaultIsolateDebugger();
+#endif
// Get the stack guard from the default isolate. Preinitializes the
// default isolate if needed.
@@ -912,6 +914,8 @@
Debug* debug() { return debug_; }
#endif
+ inline bool DebuggerHasBreakPoints();
+
#ifdef ENABLE_LOGGING_AND_PROFILING
ProducerHeapProfile* producer_heap_profile() {
return producer_heap_profile_;
=======================================
--- /branches/bleeding_edge/src/liveedit.cc Tue Apr 5 02:01:47 2011
+++ /branches/bleeding_edge/src/liveedit.cc Tue Apr 26 06:53:19 2011
@@ -1682,7 +1682,7 @@
}
-bool LiveEditFunctionTracker::IsActive() {
+bool LiveEditFunctionTracker::IsActive(Isolate* isolate) {
return false;
}
=======================================
--- /branches/bleeding_edge/src/objects-printer.cc Thu Apr 21 00:15:43 2011
+++ /branches/bleeding_edge/src/objects-printer.cc Tue Apr 26 06:53:19 2011
@@ -419,8 +419,8 @@
#define MAKE_STRUCT_CASE(NAME, Name, name) case NAME##_TYPE: return #NAME;
STRUCT_LIST(MAKE_STRUCT_CASE)
#undef MAKE_STRUCT_CASE
- }
- return "UNKNOWN";
+ default: return "UNKNOWN";
+ }
}
=======================================
--- /branches/bleeding_edge/src/runtime-profiler.cc Fri Apr 15 00:58:22 2011
+++ /branches/bleeding_edge/src/runtime-profiler.cc Tue Apr 26 06:53:19 2011
@@ -171,7 +171,7 @@
// Debug::has_break_points().
ASSERT(function->IsMarkedForLazyRecompilation());
if (!FLAG_use_osr ||
- isolate_->debug()->has_break_points() ||
+ isolate_->DebuggerHasBreakPoints() ||
function->IsBuiltin()) {
return;
}
=======================================
--- /branches/bleeding_edge/src/runtime.cc Thu Apr 21 00:15:43 2011
+++ /branches/bleeding_edge/src/runtime.cc Tue Apr 26 06:53:19 2011
@@ -7298,13 +7298,13 @@
// If the function is not optimizable or debugger is active continue
using the
// code from the full compiler.
if (!function->shared()->code()->optimizable() ||
- isolate->debug()->has_break_points()) {
+ isolate->DebuggerHasBreakPoints()) {
if (FLAG_trace_opt) {
PrintF("[failed to optimize ");
function->PrintName();
PrintF(": is code optimizable: %s, is debugger enabled: %s]\n",
function->shared()->code()->optimizable() ? "T" : "F",
- isolate->debug()->has_break_points() ? "T" : "F");
+ isolate->DebuggerHasBreakPoints() ? "T" : "F");
}
function->ReplaceCode(function->shared()->code());
return function->code();
=======================================
--- /branches/bleeding_edge/src/v8.h Thu Mar 31 09:17:37 2011
+++ /branches/bleeding_edge/src/v8.h Tue Apr 26 06:53:19 2011
@@ -66,6 +66,7 @@
#include "log-inl.h"
#include "cpu-profiler-inl.h"
#include "handles-inl.h"
+#include "isolate-inl.h"
namespace v8 {
namespace internal {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
