Index: src/x64/lithium-x64.h |
diff --git a/src/x64/lithium-x64.h b/src/x64/lithium-x64.h |
index d6edd6de8bd92f7a75d02f267f9933404d3ffcb8..6efa9d3255279e58e0408d89451eeb1796823029 100644 |
--- a/src/x64/lithium-x64.h |
+++ b/src/x64/lithium-x64.h |
@@ -81,7 +81,7 @@ class LCodeGen; |
V(ClampTToUint8) \ |
V(ClassOfTestAndBranch) \ |
V(CmpConstantEqAndBranch) \ |
- V(CmpIDAndBranch) \ |
+ V(CompareNumericAndBranch) \ |
V(CmpObjectEqAndBranch) \ |
V(CmpMapAndBranch) \ |
V(CmpT) \ |
@@ -99,7 +99,6 @@ class LCodeGen; |
V(DoubleToSmi) \ |
V(DummyUse) \ |
V(ElementsKind) \ |
- V(FixedArrayBaseLength) \ |
V(MapEnumLength) \ |
V(FunctionLiteral) \ |
V(GetCachedArrayIndex) \ |
@@ -121,6 +120,7 @@ class LCodeGen; |
V(IsObjectAndBranch) \ |
V(IsStringAndBranch) \ |
V(IsSmiAndBranch) \ |
+ V(IsNumberAndBranch) \ |
V(IsUndetectableAndBranch) \ |
V(Label) \ |
V(LazyBailout) \ |
@@ -673,9 +673,9 @@ class LMulI: public LTemplateInstruction<1, 2, 0> { |
}; |
-class LCmpIDAndBranch: public LControlInstruction<2, 0> { |
+class LCompareNumericAndBranch: public LControlInstruction<2, 0> { |
public: |
- LCmpIDAndBranch(LOperand* left, LOperand* right) { |
+ LCompareNumericAndBranch(LOperand* left, LOperand* right) { |
inputs_[0] = left; |
inputs_[1] = right; |
} |
@@ -683,8 +683,9 @@ class LCmpIDAndBranch: public LControlInstruction<2, 0> { |
LOperand* left() { return inputs_[0]; } |
LOperand* right() { return inputs_[1]; } |
- DECLARE_CONCRETE_INSTRUCTION(CmpIDAndBranch, "cmp-id-and-branch") |
- DECLARE_HYDROGEN_ACCESSOR(CompareIDAndBranch) |
+ DECLARE_CONCRETE_INSTRUCTION(CompareNumericAndBranch, |
+ "compare-numeric-and-branch") |
+ DECLARE_HYDROGEN_ACCESSOR(CompareNumericAndBranch) |
Token::Value op() const { return hydrogen()->token(); } |
bool is_double() const { |
@@ -867,6 +868,19 @@ class LIsObjectAndBranch: public LControlInstruction<1, 0> { |
}; |
+class LIsNumberAndBranch: public LControlInstruction<1, 0> { |
+ public: |
+ explicit LIsNumberAndBranch(LOperand* value) { |
+ inputs_[0] = value; |
+ } |
+ |
+ LOperand* value() { return inputs_[0]; } |
+ |
+ DECLARE_CONCRETE_INSTRUCTION(IsNumberAndBranch, "is-number-and-branch") |
+ DECLARE_HYDROGEN_ACCESSOR(IsNumberAndBranch) |
+}; |
+ |
+ |
class LIsStringAndBranch: public LControlInstruction<1, 1> { |
public: |
explicit LIsStringAndBranch(LOperand* value, LOperand* temp) { |
@@ -1233,20 +1247,6 @@ class LCmpMapAndBranch: public LControlInstruction<1, 0> { |
}; |
-class LFixedArrayBaseLength: public LTemplateInstruction<1, 1, 0> { |
- public: |
- explicit LFixedArrayBaseLength(LOperand* value) { |
- inputs_[0] = value; |
- } |
- |
- LOperand* value() { return inputs_[0]; } |
- |
- DECLARE_CONCRETE_INSTRUCTION(FixedArrayBaseLength, |
- "fixed-array-base-length") |
- DECLARE_HYDROGEN_ACCESSOR(FixedArrayBaseLength) |
-}; |
- |
- |
class LMapEnumLength: public LTemplateInstruction<1, 1, 0> { |
public: |
explicit LMapEnumLength(LOperand* value) { |