Reviewers: danno,
Message:
This should pacify the Debug tests.
Description:
Restore intended LoadIC behavior for JSBuiltinsObject
Please review this at https://codereview.chromium.org/48343004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+12, -8 lines):
M src/ic.cc
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index
55d7ba936fb3068d105d2af10673aa31b4d1896c..11cd7ecd705385d9e37ca8783ed602f48ca47cc7
100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -370,6 +370,18 @@ void IC::TryRemoveInvalidHandlers(Handle<Map> map,
Handle<String> name) {
void IC::UpdateState(Handle<Object> receiver, Handle<Object> name) {
if (!name->IsString()) return;
+
+ // The builtins object is special. It only changes when JavaScript
+ // builtins are loaded lazily. It is important to keep inline
+ // caches for the builtins object monomorphic. Therefore, if we get
+ // an inline cache miss for the builtins object after lazily loading
+ // JavaScript builtins, we return uninitialized as the state to
+ // force the inline cache back to monomorphic state.
+ if (receiver->IsJSBuiltinsObject()) {
+ state_ = UNINITIALIZED;
+ return;
+ }
+
if (state() != MONOMORPHIC) {
if (state() == POLYMORPHIC && receiver->IsHeapObject()) {
TryRemoveInvalidHandlers(
@@ -387,14 +399,6 @@ void IC::UpdateState(Handle<Object> receiver,
Handle<Object> name) {
receiver, Handle<String>::cast(name))) {
return MarkMonomorphicPrototypeFailure();
}
-
- // The builtins object is special. It only changes when JavaScript
- // builtins are loaded lazily. It is important to keep inline
- // caches for the builtins object monomorphic. Therefore, if we get
- // an inline cache miss for the builtins object after lazily loading
- // JavaScript builtins, we return uninitialized as the state to
- // force the inline cache back to monomorphic state.
- if (receiver->IsJSBuiltinsObject()) state_ = UNINITIALIZED;
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
