AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

MIPS: Handle holes in smi-untag from LoadKeyed requiring hole handling.

Browse Source 
Port r14756 (fda1989f)

BUG=

Review URL: https://codereview.chromium.org/15690003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14761 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
palfia@homejinni.com 2013-05-22 23:09:22 +00:00
parent 4d48bb832f
commit 71ab26d291
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mips/lithium-codegen-mips.cc
View File

@ -4610,6 +4610,22 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
__ And(scratch, input, Operand(kHeapObjectTag));
__ SmiUntag(result, input);
DeoptimizeIf(ne, instr->environment(), scratch, Operand(zero_reg));
} else if (instr->hydrogen()->value()->IsLoadKeyed()) {
HLoadKeyed* load = HLoadKeyed::cast(instr->hydrogen()->value());
if (load->UsesMustHandleHole()) {
__ And(scratch, input, Operand(kHeapObjectTag));
__ SmiUntag(result, input);
if (load->hole_mode() == ALLOW_RETURN_HOLE) {
Label done;
__ Branch(&done, eq, scratch, Operand(zero_reg));
__ li(result, Operand(Smi::FromInt(0)));
__ bind(&done);
} else {
DeoptimizeIf(ne, instr->environment(), scratch, Operand(zero_reg));
}
} else {
__ SmiUntag(result, input);
}
} else {
__ SmiUntag(result, input);
}

7
src/mips/lithium-mips.cc
View File

@ -1773,6 +1773,13 @@ LInstruction* LChunkBuilder::DoChange(HChange* instr) {
if (instr->value()->type().IsSmi()) {
value = UseRegisterAtStart(instr->value());
res = DefineAsRegister(new(zone()) LSmiUntag(value, false));
if (instr->value()->IsLoadKeyed()) {
HLoadKeyed* load_keyed = HLoadKeyed::cast(instr->value());
if (load_keyed->UsesMustHandleHole() &&
load_keyed->hole_mode() == NEVER_RETURN_HOLE) {
res = AssignEnvironment(res);
}
}
} else {
value = UseRegister(instr->value());
LOperand* temp1 = TempRegister();

1
src/mips/lithium-mips.h
View File

@ -2034,6 +2034,7 @@ class LSmiUntag: public LTemplateInstruction<1, 1, 0> {
LOperand* value() { return inputs_[0]; }
bool needs_check() const { return needs_check_; }
DECLARE_HYDROGEN_ACCESSOR(Change);
DECLARE_CONCRETE_INSTRUCTION(SmiUntag, "smi-untag")
private: