Index: src/type-info.cc |
diff --git a/src/type-info.cc b/src/type-info.cc |
index 1059c7aecd8796e4f31d0a9f4a9e3ff3354f4719..d6cdef630a42b593d257b23671058acb4a63fb36 100644 |
--- a/src/type-info.cc |
+++ b/src/type-info.cc |
@@ -51,13 +51,25 @@ Handle<Object> TypeFeedbackOracle::GetInfo(TypeFeedbackId ast_id) { |
Handle<Object> TypeFeedbackOracle::GetInfo(FeedbackVectorSlot slot) { |
DCHECK(slot.ToInt() >= 0 && slot.ToInt() < feedback_vector_->length()); |
+ Handle<Object> undefined = |
+ Handle<Object>::cast(isolate()->factory()->undefined_value()); |
Object* obj = feedback_vector_->Get(slot); |
+ |
+ // Slots do not embed direct pointers to functions. Instead a WeakCell is |
+ // always used. |
+ if (obj->IsWeakCell()) { |
+ WeakCell* cell = WeakCell::cast(obj); |
+ if (cell->cleared()) return undefined; |
+ obj = cell->value(); |
+ } |
+ |
if (!obj->IsJSFunction() || |
!CanRetainOtherContext(JSFunction::cast(obj), *native_context_)) { |
DCHECK(!obj->IsMap()); |
return Handle<Object>(obj, isolate()); |
} |
- return Handle<Object>::cast(isolate()->factory()->undefined_value()); |
+ |
+ return undefined; |
} |