From 1cf26e2bf1d305c1e444f50ed0f4ed08b8df7106 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sat, 3 Dec 2011 23:30:56 -0800 Subject: [PATCH] Upgrade V8 to 3.6.6.11 --- deps/v8/src/debug.cc | 38 ----------------------------- deps/v8/src/log.h | 6 +++++ deps/v8/src/version.cc | 2 +- deps/v8/test/mjsunit/mjsunit.status | 4 +++ 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/deps/v8/src/debug.cc b/deps/v8/src/debug.cc index a229d39c3e..20cd802748 100644 --- a/deps/v8/src/debug.cc +++ b/deps/v8/src/debug.cc @@ -1731,44 +1731,6 @@ void Debug::PrepareForBreakPoints() { // functions as debugging does not work with optimized code. if (!has_break_points_) { Deoptimizer::DeoptimizeAll(); - - AssertNoAllocation no_allocation; - Builtins* builtins = isolate_->builtins(); - Code* lazy_compile = builtins->builtin(Builtins::kLazyCompile); - - // Find all non-optimized code functions with activation frames on - // the stack. - List active_functions(100); - for (JavaScriptFrameIterator it(isolate_); !it.done(); it.Advance()) { - JavaScriptFrame* frame = it.frame(); - if (frame->function()->IsJSFunction()) { - JSFunction* function = JSFunction::cast(frame->function()); - if (function->code()->kind() == Code::FUNCTION) - active_functions.Add(function); - } - } - active_functions.Sort(); - - // Scan the heap for all non-optimized functions which has no - // debug break slots. - HeapIterator iterator; - HeapObject* obj = NULL; - while (((obj = iterator.next()) != NULL)) { - if (obj->IsJSFunction()) { - JSFunction* function = JSFunction::cast(obj); - if (function->shared()->allows_lazy_compilation() && - function->shared()->script()->IsScript() && - function->code()->kind() == Code::FUNCTION && - !function->code()->has_debug_break_slots()) { - bool has_activation = - SortedListBSearch(active_functions, function) != -1; - if (!has_activation) { - function->set_code(lazy_compile); - function->shared()->set_code(lazy_compile); - } - } - } - } } } diff --git a/deps/v8/src/log.h b/deps/v8/src/log.h index fe19810a2c..50358ce56f 100644 --- a/deps/v8/src/log.h +++ b/deps/v8/src/log.h @@ -294,7 +294,13 @@ class Logger { INLINE(static LogEventsAndTags ToNativeByScript(LogEventsAndTags, Script*)); // Profiler's sampling interval (in milliseconds). +#if defined(ANDROID) + // Phones and tablets have processors that are much slower than desktop + // and laptop computers for which current heuristics are tuned. + static const int kSamplingIntervalMs = 5; +#else static const int kSamplingIntervalMs = 1; +#endif // Callback from Log, stops profiling in case of insufficient resources. void LogFailure(); diff --git a/deps/v8/src/version.cc b/deps/v8/src/version.cc index 2865502c1f..7f916e17c8 100644 --- a/deps/v8/src/version.cc +++ b/deps/v8/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 6 #define BUILD_NUMBER 6 -#define PATCH_LEVEL 8 +#define PATCH_LEVEL 11 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/deps/v8/test/mjsunit/mjsunit.status b/deps/v8/test/mjsunit/mjsunit.status index 027da584b4..bae09b4e38 100644 --- a/deps/v8/test/mjsunit/mjsunit.status +++ b/deps/v8/test/mjsunit/mjsunit.status @@ -34,6 +34,10 @@ bugs: FAIL # Fails. regress/regress-1119: FAIL +############################################################################# +# Fails due to r10102 which reverts precise stepping on the 3.6 branch. +debug-step-2: FAIL + ############################################################################## # Too slow in debug mode with --stress-opt compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug