Index: src/compiler/js-generic-lowering.cc |
diff --git a/src/compiler/js-generic-lowering.cc b/src/compiler/js-generic-lowering.cc |
index 038412ecf6ba59272e5a0e41c7684745a5a176a1..9b18e21193d539070515d728dd0a0ec58671a4e7 100644 |
--- a/src/compiler/js-generic-lowering.cc |
+++ b/src/compiler/js-generic-lowering.cc |
@@ -62,16 +62,11 @@ Reduction JSGenericLowering::Reduce(Node* node) { |
return Changed(node); |
} |
- |
-#define REPLACE_BINARY_OP_IC_CALL(Op, token) \ |
- void JSGenericLowering::Lower##Op(Node* node) { \ |
- BinaryOperationParameters const& p = \ |
- BinaryOperationParametersOf(node->op()); \ |
- CallDescriptor::Flags flags = AdjustFrameStatesForCall(node); \ |
- ReplaceWithStubCall(node, \ |
- CodeFactory::BinaryOpIC(isolate(), token, \ |
- strength(p.language_mode())), \ |
- CallDescriptor::kPatchableCallSiteWithNop | flags); \ |
+#define REPLACE_BINARY_OP_IC_CALL(Op, token) \ |
+ void JSGenericLowering::Lower##Op(Node* node) { \ |
+ CallDescriptor::Flags flags = AdjustFrameStatesForCall(node); \ |
+ ReplaceWithStubCall(node, CodeFactory::BinaryOpIC(isolate(), token), \ |
+ CallDescriptor::kPatchableCallSiteWithNop | flags); \ |
} |
REPLACE_BINARY_OP_IC_CALL(JSBitwiseOr, Token::BIT_OR) |
REPLACE_BINARY_OP_IC_CALL(JSBitwiseXor, Token::BIT_XOR) |
@@ -89,29 +84,21 @@ REPLACE_BINARY_OP_IC_CALL(JSModulus, Token::MOD) |
// These ops are not language mode dependent; we arbitrarily pass Strength::WEAK |
// here. |
-#define REPLACE_COMPARE_IC_CALL(op, token) \ |
- void JSGenericLowering::Lower##op(Node* node) { \ |
- ReplaceWithCompareIC(node, token, Strength::WEAK); \ |
+#define REPLACE_COMPARE_IC_CALL(op, token) \ |
+ void JSGenericLowering::Lower##op(Node* node) { \ |
+ ReplaceWithCompareIC(node, token); \ |
} |
REPLACE_COMPARE_IC_CALL(JSEqual, Token::EQ) |
REPLACE_COMPARE_IC_CALL(JSNotEqual, Token::NE) |
REPLACE_COMPARE_IC_CALL(JSStrictEqual, Token::EQ_STRICT) |
REPLACE_COMPARE_IC_CALL(JSStrictNotEqual, Token::NE_STRICT) |
+REPLACE_COMPARE_IC_CALL(JSLessThan, Token::LT) |
+REPLACE_COMPARE_IC_CALL(JSGreaterThan, Token::GT) |
+REPLACE_COMPARE_IC_CALL(JSLessThanOrEqual, Token::LTE) |
+REPLACE_COMPARE_IC_CALL(JSGreaterThanOrEqual, Token::GTE) |
#undef REPLACE_COMPARE_IC_CALL |
-#define REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE(op, token) \ |
- void JSGenericLowering::Lower##op(Node* node) { \ |
- ReplaceWithCompareIC(node, token, \ |
- strength(OpParameter<LanguageMode>(node))); \ |
- } |
-REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE(JSLessThan, Token::LT) |
-REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE(JSGreaterThan, Token::GT) |
-REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE(JSLessThanOrEqual, Token::LTE) |
-REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE(JSGreaterThanOrEqual, Token::GTE) |
-#undef REPLACE_COMPARE_IC_CALL_WITH_LANGUAGE_MODE |
- |
- |
#define REPLACE_RUNTIME_CALL(op, fun) \ |
void JSGenericLowering::Lower##op(Node* node) { \ |
ReplaceWithRuntimeCall(node, fun); \ |
@@ -130,10 +117,8 @@ static CallDescriptor::Flags FlagsForNode(Node* node) { |
return result; |
} |
- |
-void JSGenericLowering::ReplaceWithCompareIC(Node* node, Token::Value token, |
- Strength str) { |
- Callable callable = CodeFactory::CompareIC(isolate(), token, str); |
+void JSGenericLowering::ReplaceWithCompareIC(Node* node, Token::Value token) { |
+ Callable callable = CodeFactory::CompareIC(isolate(), token); |
// Create a new call node asking a CompareIC for help. |
NodeVector inputs(zone()); |