Reviewers: fschneider,
Description:
Runtime_NotifyDeoptimized should search for function activation in all
thread
stacks.
[email protected]
BUG=v8:1763
Please review this at http://codereview.chromium.org/8240004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/frames-inl.h
M src/frames.h
M src/runtime.cc
Index: src/frames-inl.h
diff --git a/src/frames-inl.h b/src/frames-inl.h
index
4b8a4beb8247651056d2dce3a5b4014734eda89f..94c745cfc28aa4ef6719db4e4c69120b540ff51e
100644
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -262,6 +262,15 @@ inline
JavaScriptFrameIteratorTemp<Iterator>::JavaScriptFrameIteratorTemp(
if (!done()) Advance();
}
+
+template<typename Iterator>
+inline JavaScriptFrameIteratorTemp<Iterator>::JavaScriptFrameIteratorTemp(
+ Isolate* isolate, ThreadLocalTop* top)
+ : iterator_(isolate, top) {
+ if (!done()) Advance();
+}
+
+
template<typename Iterator>
inline JavaScriptFrame* JavaScriptFrameIteratorTemp<Iterator>::frame()
const {
// TODO(1233797): The frame hierarchy needs to change. It's
Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index
1d658264ab04d1334e398077d88e5163d6eeb9fd..ca19b053aa682ddc9e221f12c6d72444f8a983f8
100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -702,6 +702,8 @@ class JavaScriptFrameIteratorTemp BASE_EMBEDDED {
inline explicit JavaScriptFrameIteratorTemp(Isolate* isolate);
+ inline JavaScriptFrameIteratorTemp(Isolate* isolate, ThreadLocalTop*
top);
+
// Skip frames until the frame with the given id is reached.
explicit JavaScriptFrameIteratorTemp(StackFrame::Id id) {
AdvanceToId(id); }
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
cafe46cfb84c081936a9dc9c64270e8570c3be18..e0f507e1774bbd7c7d500994f40a07e74ae8f1e6
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -8178,6 +8178,31 @@ RUNTIME_FUNCTION(MaybeObject*,
Runtime_LazyRecompile) {
}
+class ActivationsFinder : public ThreadVisitor {
+ public:
+ explicit ActivationsFinder(JSFunction* function)
+ : function_(function), has_activations_(false) {}
+
+ void VisitThread(Isolate* isolate, ThreadLocalTop* top) {
+ if (has_activations_) return;
+
+ for (JavaScriptFrameIterator it(isolate, top); !it.done();
it.Advance()) {
+ JavaScriptFrame* frame = it.frame();
+ if (frame->is_optimized() && frame->function() == function_) {
+ has_activations_ = true;
+ return;
+ }
+ }
+ }
+
+ bool has_activations() { return has_activations_; }
+
+ private:
+ JSFunction* function_;
+ bool has_activations_;
+};
+
+
RUNTIME_FUNCTION(MaybeObject*, Runtime_NotifyDeoptimized) {
HandleScope scope(isolate);
ASSERT(args.length() == 1);
@@ -8224,17 +8249,24 @@ RUNTIME_FUNCTION(MaybeObject*,
Runtime_NotifyDeoptimized) {
return isolate->heap()->undefined_value();
}
- // Count the number of optimized activations of the function.
- int activations = 0;
+ // Find other optimized activations of the function.
+ bool has_other_activations = false;
while (!it.done()) {
JavaScriptFrame* frame = it.frame();
if (frame->is_optimized() && frame->function() == *function) {
- activations++;
+ has_other_activations = true;
+ break;
}
it.Advance();
}
- if (activations == 0) {
+ if (!has_other_activations) {
+ ActivationsFinder activations_finder(*function);
+ isolate->thread_manager()->IterateArchivedThreads(&activations_finder);
+ has_other_activations = activations_finder.has_activations();
+ }
+
+ if (!has_other_activations) {
if (FLAG_trace_deopt) {
PrintF("[removing optimized code for: ");
function->PrintName();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
