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

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 384703002: Revert r38116 because of crashes. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 5 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/intermediate_language.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc (revision 38117)
+++ runtime/vm/intermediate_language_arm.cc (working copy)
@@ -5686,16 +5686,12 @@
LocationSummary* CheckClassInstr::MakeLocationSummary(Isolate* isolate,
bool opt) const {
const intptr_t kNumInputs = 1;
- const bool need_mask_temp = IsDenseSwitch() && !IsDenseMask(ComputeCidMask());
- const intptr_t kNumTemps = !IsNullCheck() ? (need_mask_temp ? 2 : 1) : 0;
+ const intptr_t kNumTemps = !IsNullCheck() ? 1 : 0;
LocationSummary* summary = new(isolate) LocationSummary(
isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
summary->set_in(0, Location::RequiresRegister());
if (!IsNullCheck()) {
summary->set_temp(0, Location::RequiresRegister());
- if (need_mask_temp) {
- summary->set_temp(1, Location::RequiresRegister());
- }
}
return summary;
}
@@ -5728,34 +5724,15 @@
__ b(deopt, EQ);
}
__ LoadClassId(temp, value);
-
- if (IsDenseSwitch()) {
- ASSERT(cids_[0] < cids_[cids_.length() - 1]);
- __ AddImmediate(temp, -cids_[0]);
- __ CompareImmediate(temp, cids_[cids_.length() - 1] - cids_[0]);
- __ b(deopt, HI);
-
- intptr_t mask = ComputeCidMask();
- if (!IsDenseMask(mask)) {
- // Only need mask if there are missing numbers in the range.
- ASSERT(cids_.length() > 2);
- Register mask_reg = locs()->temp(1).reg();
- __ LoadImmediate(mask_reg, 1);
- __ Lsl(mask_reg, mask_reg, temp);
- __ TestImmediate(mask_reg, mask);
- __ b(deopt, EQ);
+ const intptr_t num_checks = unary_checks().NumberOfChecks();
+ for (intptr_t i = cix; i < num_checks; i++) {
+ ASSERT(unary_checks().GetReceiverClassIdAt(i) != kSmiCid);
+ __ CompareImmediate(temp, unary_checks().GetReceiverClassIdAt(i));
+ if (i == (num_checks - 1)) {
+ __ b(deopt, NE);
+ } else {
+ __ b(&is_ok, EQ);
}
- } else {
- const intptr_t num_checks = unary_checks().NumberOfChecks();
- for (intptr_t i = cix; i < num_checks; i++) {
- ASSERT(unary_checks().GetReceiverClassIdAt(i) != kSmiCid);
- __ CompareImmediate(temp, unary_checks().GetReceiverClassIdAt(i));
- if (i == (num_checks - 1)) {
- __ b(deopt, NE);
- } else {
- __ b(&is_ok, EQ);
- }
- }
}
__ Bind(&is_ok);
}
@@ -5780,33 +5757,6 @@
}
-LocationSummary* CheckClassIdInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- const intptr_t kNumInputs = 2;
- const intptr_t kNumTemps = 0;
- LocationSummary* summary = new(isolate) LocationSummary(
- isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
- summary->set_in(0, Location::RequiresRegister());
- summary->set_in(1, Location::RegisterOrSmiConstant(right()));
- return summary;
-}
-
-
-void CheckClassIdInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register left = locs()->in(0).reg();
- Location right = locs()->in(1);
- Label* deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckClass);
- if (right.IsRegister()) {
- __ cmp(left, Operand(right.reg()));
- } else {
- ASSERT(right.IsConstant());
- const Object& right_const = Smi::Cast(right.constant());
- __ CompareImmediate(left, reinterpret_cast<int32_t>(right_const.raw()));
- }
- __ b(deopt, NE);
-}
-
-
LocationSummary* CheckArrayBoundInstr::MakeLocationSummary(Isolate* isolate,
bool opt) const {
const intptr_t kNumInputs = 2;
« no previous file with comments | « runtime/vm/intermediate_language.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698