Revision: 10102
Author: [email protected]
Date: Wed Nov 30 13:50:57 2011
Log: Manually revert the effect of r9250 from the 3.6 branch
[email protected]
BUG=chromium:105375
Review URL: http://codereview.chromium.org/8742020
http://code.google.com/p/v8/source/detail?r=10102
Modified:
/branches/3.6/src/debug.cc
/branches/3.6/src/version.cc
=======================================
--- /branches/3.6/src/debug.cc Thu Sep 15 00:25:40 2011
+++ /branches/3.6/src/debug.cc Wed Nov 30 13:50:57 2011
@@ -1731,44 +1731,6 @@
// 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<JSFunction*> 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<JSFunction*>(active_functions,
function) != -1;
- if (!has_activation) {
- function->set_code(lazy_compile);
- function->shared()->set_code(lazy_compile);
- }
- }
- }
- }
}
}
=======================================
--- /branches/3.6/src/version.cc Fri Nov 11 09:49:27 2011
+++ /branches/3.6/src/version.cc Wed Nov 30 13:50:57 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 6
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
