Reviewers: Jakob,
Message:
PTAL
Description:
Add premonomorphic store ICs. This also fixes wrongly inlined accessors due
to
monomorphic store ICs with interceptors.
BUG=
Please review this at https://chromiumcodereview.appspot.com/23442016/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/builtins.h
M src/builtins.cc
M src/hydrogen.cc
M src/ic.h
M src/ic.cc
Index: src/builtins.cc
diff --git a/src/builtins.cc b/src/builtins.cc
index
f1ee0a4e71658a878b79d6ce001ae2ada1687906..9ac0769ce072c5f168843ed9b30113355a23f3c6
100644
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -1461,6 +1461,16 @@ static void
Generate_StoreIC_Initialize_Strict(MacroAssembler* masm) {
}
+static void Generate_StoreIC_PreMonomorphic(MacroAssembler* masm) {
+ StoreIC::GeneratePreMonomorphic(masm);
+}
+
+
+static void Generate_StoreIC_PreMonomorphic_Strict(MacroAssembler* masm) {
+ StoreIC::GeneratePreMonomorphic(masm);
+}
+
+
static void Generate_StoreIC_Miss(MacroAssembler* masm) {
StoreIC::GenerateMiss(masm);
}
@@ -1546,6 +1556,16 @@ static void
Generate_KeyedStoreIC_Initialize_Strict(MacroAssembler* masm) {
}
+static void Generate_KeyedStoreIC_PreMonomorphic(MacroAssembler* masm) {
+ KeyedStoreIC::GeneratePreMonomorphic(masm);
+}
+
+
+static void Generate_KeyedStoreIC_PreMonomorphic_Strict(MacroAssembler*
masm) {
+ KeyedStoreIC::GeneratePreMonomorphic(masm);
+}
+
+
static void Generate_KeyedStoreIC_NonStrictArguments(MacroAssembler* masm)
{
KeyedStoreIC::GenerateNonStrictArguments(masm);
}
Index: src/builtins.h
diff --git a/src/builtins.h b/src/builtins.h
index
a7c774a6a2a506d5c86d057a821b6d1bf56ee7a0..9f46f8678b1cc664c36c22297d370abc4647b495
100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -162,6 +162,8 @@ enum BuiltinExtraArguments {
\
V(StoreIC_Initialize, STORE_IC, UNINITIALIZED, \
Code::kNoExtraICState) \
+ V(StoreIC_PreMonomorphic, STORE_IC, PREMONOMORPHIC, \
+ Code::kNoExtraICState) \
V(StoreIC_Normal, STORE_IC, MONOMORPHIC, \
Code::kNoExtraICState) \
V(StoreIC_Megamorphic, STORE_IC, MEGAMORPHIC, \
@@ -174,6 +176,8 @@ enum BuiltinExtraArguments {
Code::kNoExtraICState) \
V(StoreIC_Initialize_Strict, STORE_IC, UNINITIALIZED, \
kStrictMode) \
+ V(StoreIC_PreMonomorphic_Strict, STORE_IC, PREMONOMORPHIC, \
+ kStrictMode) \
V(StoreIC_Normal_Strict, STORE_IC, MONOMORPHIC, \
kStrictMode) \
V(StoreIC_Megamorphic_Strict, STORE_IC, MEGAMORPHIC, \
@@ -185,11 +189,15 @@ enum BuiltinExtraArguments {
\
V(KeyedStoreIC_Initialize, KEYED_STORE_IC, UNINITIALIZED, \
Code::kNoExtraICState) \
+ V(KeyedStoreIC_PreMonomorphic, KEYED_STORE_IC, PREMONOMORPHIC, \
+ Code::kNoExtraICState) \
V(KeyedStoreIC_Generic, KEYED_STORE_IC, GENERIC, \
Code::kNoExtraICState) \
\
V(KeyedStoreIC_Initialize_Strict, KEYED_STORE_IC, UNINITIALIZED, \
kStrictMode) \
+ V(KeyedStoreIC_PreMonomorphic_Strict, KEYED_STORE_IC, PREMONOMORPHIC, \
+ kStrictMode) \
V(KeyedStoreIC_Generic_Strict, KEYED_STORE_IC, GENERIC, \
kStrictMode) \
V(KeyedStoreIC_NonStrictArguments, KEYED_STORE_IC, MONOMORPHIC, \
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
0b1fe09ed249aa6aa2bbb5911e33a8abe51ba4b7..89f29d32d45a51304e0e9cf2bf48f445b918c184
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -4997,7 +4997,8 @@ void
HOptimizedGraphBuilder::BuildStoreNamed(Expression* expr,
Handle<Map> map;
if (monomorphic) {
map = types->first();
- if (map->is_dictionary_map()) monomorphic = false;
+ LookupResult lookup(isolate());
+ monomorphic = ComputeLoadStoreField(map, name, &lookup, true);
}
if (monomorphic) {
Handle<JSFunction> setter;
@@ -5138,7 +5139,8 @@ void
HOptimizedGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
map = types->first();
// We can't generate code for a monomorphic dict mode load so
// just pretend it is not monomorphic.
- if (map->is_dictionary_map()) monomorphic = false;
+ LookupResult lookup(isolate());
+ monomorphic = ComputeLoadStoreField(map, name, &lookup, false);
}
if (monomorphic) {
Handle<JSFunction> getter;
@@ -5896,10 +5898,12 @@ void
HOptimizedGraphBuilder::VisitProperty(Property* expr) {
bool monomorphic = false;
if (expr->IsMonomorphic()) {
map = types->first();
- monomorphic = !map->is_dictionary_map();
+ LookupResult lookup(isolate());
+ monomorphic = ComputeLoadStoreField(map, name, &lookup, false);
} else if (object->HasMonomorphicJSObjectType()) {
map = object->GetMonomorphicJSObjectMap();
- monomorphic = !map->is_dictionary_map();
+ LookupResult lookup(isolate());
+ monomorphic = ComputeLoadStoreField(map, name, &lookup, false);
}
if (monomorphic) {
Handle<JSFunction> getter;
@@ -7582,7 +7586,8 @@ void
HOptimizedGraphBuilder::VisitCountOperation(CountOperation* expr) {
SmallMapList* types = prop->GetReceiverTypes();
if (monomorphic) {
map = types->first();
- if (map->is_dictionary_map()) monomorphic = false;
+ LookupResult lookup(isolate());
+ monomorphic = ComputeLoadStoreField(map, name, &lookup, false);
}
if (monomorphic) {
Handle<JSFunction> getter;
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index
2a1f83d9e47ac16c98f71c4504ff46457412e6e5..6da167bdaad6144700ddedb095b3f41b6b4b79f6
100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1709,15 +1709,21 @@ MaybeObject* StoreIC::Store(State state,
}
LookupResult lookup(isolate());
- if (LookupForWrite(receiver, name, value, &lookup, &state)) {
- if (FLAG_use_ic) {
- UpdateCaches(&lookup, state, strict_mode, receiver, name, value);
- }
- } else if (strict_mode == kStrictMode &&
- !(lookup.IsProperty() && lookup.IsReadOnly()) &&
- IsUndeclaredGlobal(object)) {
+ bool can_store = LookupForWrite(receiver, name, value, &lookup, &state);
+ if (!can_store &&
+ strict_mode == kStrictMode &&
+ !(lookup.IsProperty() && lookup.IsReadOnly()) &&
+ IsUndeclaredGlobal(object)) {
// Strict mode doesn't allow setting non-existent global property.
return ReferenceError("not_defined", name);
+ } else if (FLAG_use_ic && state == UNINITIALIZED) {
+ Handle<Code> stub = (strict_mode == kStrictMode)
+ ? pre_monomorphic_stub_strict()
+ : pre_monomorphic_stub();
+ set_target(*stub);
+ TRACE_IC("StoreIC", name, state, *stub);
+ } else if (FLAG_use_ic && can_store) {
+ UpdateCaches(&lookup, state, strict_mode, receiver, name, value);
} else if (FLAG_use_ic &&
(lookup.IsNormal() ||
(lookup.IsField() && lookup.CanHoldValue(value)))) {
Index: src/ic.h
diff --git a/src/ic.h b/src/ic.h
index
fcf0de58f1a85e7694cffaa68fc062fe45ab24fa..c910d47b4e8237e3ae0615719fb96a80298269cd
100644
--- a/src/ic.h
+++ b/src/ic.h
@@ -527,6 +527,9 @@ class StoreIC: public IC {
// Code generators for stub routines. Only called once at startup.
static void GenerateSlow(MacroAssembler* masm);
static void GenerateInitialize(MacroAssembler* masm) {
GenerateMiss(masm); }
+ static void GeneratePreMonomorphic(MacroAssembler* masm) {
+ GenerateMiss(masm);
+ }
static void GenerateMiss(MacroAssembler* masm);
static void GenerateMegamorphic(MacroAssembler* masm,
StrictModeFlag strict_mode);
@@ -558,6 +561,12 @@ class StoreIC: public IC {
virtual Handle<Code> generic_stub_strict() const {
return isolate()->builtins()->StoreIC_Generic_Strict();
}
+ virtual Handle<Code> pre_monomorphic_stub() const {
+ return isolate()->builtins()->StoreIC_PreMonomorphic();
+ }
+ virtual Handle<Code> pre_monomorphic_stub_strict() const {
+ return isolate()->builtins()->StoreIC_PreMonomorphic_Strict();
+ }
virtual Handle<Code> global_proxy_stub() {
return isolate()->builtins()->StoreIC_GlobalProxy();
}
@@ -643,6 +652,9 @@ class KeyedStoreIC: public StoreIC {
static void GenerateInitialize(MacroAssembler* masm) {
GenerateMiss(masm, MISS);
}
+ static void GeneratePreMonomorphic(MacroAssembler* masm) {
+ GenerateMiss(masm, MISS);
+ }
static void GenerateMiss(MacroAssembler* masm, ICMissMode force_generic);
static void GenerateSlow(MacroAssembler* masm);
static void GenerateRuntimeSetProperty(MacroAssembler* masm,
@@ -660,6 +672,12 @@ class KeyedStoreIC: public StoreIC {
Handle<Object> value);
virtual void UpdateMegamorphicCache(Map* map, Name* name, Code* code) { }
+ virtual Handle<Code> pre_monomorphic_stub() const {
+ return isolate()->builtins()->KeyedStoreIC_PreMonomorphic();
+ }
+ virtual Handle<Code> pre_monomorphic_stub_strict() const {
+ return isolate()->builtins()->KeyedStoreIC_PreMonomorphic_Strict();
+ }
virtual Handle<Code> megamorphic_stub() {
return isolate()->builtins()->KeyedStoreIC_Generic();
}
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
