Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index bdb90cae396084e02fe269a1d418a94b556094f5..40c504ee7abef29185273d74e30b0c3246e83370 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -4874,16 +4874,6 @@ void LCodeGen::DoInteger32ToDouble(LInteger32ToDouble* instr) { |
} |
-void LCodeGen::DoInteger32ToSmi(LInteger32ToSmi* instr) { |
- Register input = ToRegister(instr->value()); |
- __ SmiTag(input); |
- if (!instr->hydrogen()->value()->HasRange() || |
- !instr->hydrogen()->value()->range()->IsInSmiRange()) { |
- DeoptimizeIf(overflow, instr->environment()); |
- } |
-} |
- |
- |
void LCodeGen::DoUint32ToDouble(LUint32ToDouble* instr) { |
LOperand* input = instr->value(); |
LOperand* output = instr->result(); |
@@ -4903,17 +4893,6 @@ void LCodeGen::DoUint32ToDouble(LUint32ToDouble* instr) { |
} |
-void LCodeGen::DoUint32ToSmi(LUint32ToSmi* instr) { |
- Register input = ToRegister(instr->value()); |
- if (!instr->hydrogen()->value()->HasRange() || |
- !instr->hydrogen()->value()->range()->IsInSmiRange()) { |
- __ test(input, Immediate(0xc0000000)); |
- DeoptimizeIf(not_zero, instr->environment()); |
- } |
- __ SmiTag(input); |
-} |
- |
- |
void LCodeGen::DoNumberTagI(LNumberTagI* instr) { |
class DeferredNumberTagI V8_FINAL : public LDeferredCode { |
public: |
@@ -5115,10 +5094,18 @@ void LCodeGen::DoDeferredNumberTagD(LNumberTagD* instr) { |
void LCodeGen::DoSmiTag(LSmiTag* instr) { |
- LOperand* input = instr->value(); |
- ASSERT(input->IsRegister() && input->Equals(instr->result())); |
- ASSERT(!instr->hydrogen_value()->CheckFlag(HValue::kCanOverflow)); |
- __ SmiTag(ToRegister(input)); |
+ HChange* hchange = instr->hydrogen(); |
+ Register input = ToRegister(instr->value()); |
+ if (hchange->CheckFlag(HValue::kCanOverflow) && |
+ hchange->value()->CheckFlag(HValue::kUint32)) { |
+ __ test(input, Immediate(0xc0000000)); |
+ DeoptimizeIf(not_zero, instr->environment()); |
+ } |
+ __ SmiTag(input); |
+ if (hchange->CheckFlag(HValue::kCanOverflow) && |
+ !hchange->value()->CheckFlag(HValue::kUint32)) { |
+ DeoptimizeIf(overflow, instr->environment()); |
+ } |
} |