Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1842)

Unified Diff: runtime/vm/intermediate_language_ia32.cc

Issue 10883054: Split class and smi check from array operations. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_optimizer.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_ia32.cc
===================================================================
--- runtime/vm/intermediate_language_ia32.cc (revision 11380)
+++ runtime/vm/intermediate_language_ia32.cc (working copy)
@@ -794,12 +794,14 @@
(receiver_type() == kArrayCid) ||
(receiver_type() == kImmutableArrayCid));
const intptr_t kNumInputs = 2;
- const intptr_t kNumTemps = 1;
+ const intptr_t kNumTemps = receiver_type() == kGrowableObjectArrayCid ? 1 : 0;
LocationSummary* locs =
new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
locs->set_in(0, Location::RequiresRegister());
locs->set_in(1, Location::RequiresRegister());
- locs->set_temp(0, Location::RequiresRegister());
+ if (receiver_type() == kGrowableObjectArrayCid) {
+ locs->set_temp(0, Location::RequiresRegister());
+ }
locs->set_out(Location::RequiresRegister());
return locs;
}
@@ -809,7 +811,6 @@
Register receiver = locs()->in(0).reg();
Register index = locs()->in(1).reg();
Register result = locs()->out().reg();
- Register temp = locs()->temp(0).reg();
const DeoptReasonId deopt_reason =
(receiver_type() == kGrowableObjectArrayCid) ?
@@ -819,14 +820,6 @@
original()->try_index(),
deopt_reason);
- __ testl(receiver, Immediate(kSmiTagMask)); // Deoptimize if Smi.
- __ j(ZERO, deopt);
- __ CompareClassId(receiver, receiver_type(), temp);
- __ j(NOT_EQUAL, deopt);
-
- __ testl(index, Immediate(kSmiTagMask));
- __ j(NOT_ZERO, deopt);
-
switch (receiver_type()) {
case kArrayCid:
case kImmutableArrayCid:
@@ -861,13 +854,15 @@
ASSERT((receiver_type() == kGrowableObjectArrayCid) ||
(receiver_type() == kArrayCid));
const intptr_t kNumInputs = 3;
- const intptr_t kNumTemps = 1;
+ const intptr_t kNumTemps = receiver_type() == kGrowableObjectArrayCid ? 1 : 0;
LocationSummary* locs =
new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
locs->set_in(0, Location::RequiresRegister());
locs->set_in(1, Location::RequiresRegister());
locs->set_in(2, Location::RequiresRegister());
- locs->set_temp(0, Location::RequiresRegister());
+ if (receiver_type() == kGrowableObjectArrayCid) {
+ locs->set_temp(0, Location::RequiresRegister());
+ }
locs->set_out(Location::NoLocation());
return locs;
}
@@ -877,20 +872,11 @@
Register receiver = locs()->in(0).reg();
Register index = locs()->in(1).reg();
Register value = locs()->in(2).reg();
- Register temp = locs()->temp(0).reg();
Label* deopt = compiler->AddDeoptStub(original()->deopt_id(),
original()->try_index(),
kDeoptStoreIndexed);
- __ testl(receiver, Immediate(kSmiTagMask)); // Deoptimize if Smi.
- __ j(ZERO, deopt);
- __ CompareClassId(receiver, receiver_type(), temp);
- __ j(NOT_EQUAL, deopt);
-
- __ testl(index, Immediate(kSmiTagMask));
- __ j(NOT_ZERO, deopt);
-
switch (receiver_type()) {
case kArrayCid:
case kImmutableArrayCid:
@@ -910,6 +896,7 @@
break;
case kGrowableObjectArrayCid: {
+ Register temp = locs()->temp(0).reg();
__ cmpl(index,
FieldAddress(receiver, GrowableObjectArray::length_offset()));
__ j(ABOVE_EQUAL, deopt);
« no previous file with comments | « runtime/vm/flow_graph_optimizer.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698