Index: src/compiler/js-operator.cc |
diff --git a/src/compiler/js-operator.cc b/src/compiler/js-operator.cc |
index 28e239e734d3b8b1667008b3994f8c4cbf7ad743..d569490e6723338442138feadb7077fce5390c18 100644 |
--- a/src/compiler/js-operator.cc |
+++ b/src/compiler/js-operator.cc |
@@ -76,29 +76,28 @@ ConstructParameters const& ConstructParametersOf(Operator const* op) { |
return OpParameter<ConstructParameters>(op); |
} |
-bool operator==(SpreadWithArityParameters const& lhs, |
- SpreadWithArityParameters const& rhs) { |
+bool operator==(SpreadWithArityParameter const& lhs, |
+ SpreadWithArityParameter const& rhs) { |
return lhs.arity() == rhs.arity(); |
} |
-bool operator!=(SpreadWithArityParameters const& lhs, |
- SpreadWithArityParameters const& rhs) { |
+bool operator!=(SpreadWithArityParameter const& lhs, |
+ SpreadWithArityParameter const& rhs) { |
return !(lhs == rhs); |
} |
-size_t hash_value(SpreadWithArityParameters const& p) { |
+size_t hash_value(SpreadWithArityParameter const& p) { |
return base::hash_combine(p.arity()); |
} |
-std::ostream& operator<<(std::ostream& os, SpreadWithArityParameters const& p) { |
+std::ostream& operator<<(std::ostream& os, SpreadWithArityParameter const& p) { |
return os << p.arity(); |
} |
-SpreadWithArityParameters const& SpreadWithArityParametersOf( |
- Operator const* op) { |
+SpreadWithArityParameter const& SpreadWithArityParameterOf(Operator const* op) { |
DCHECK(op->opcode() == IrOpcode::kJSConstructWithSpread || |
op->opcode() == IrOpcode::kJSCallWithSpread); |
- return OpParameter<SpreadWithArityParameters>(op); |
+ return OpParameter<SpreadWithArityParameter>(op); |
} |
std::ostream& operator<<(std::ostream& os, CallParameters const& p) { |
@@ -276,27 +275,25 @@ StoreNamedOwnParameters const& StoreNamedOwnParametersOf(const Operator* op) { |
return OpParameter<StoreNamedOwnParameters>(op); |
} |
-bool operator==(DataPropertyParameters const& lhs, |
- DataPropertyParameters const& rhs) { |
+bool operator==(FeedbackParameter const& lhs, FeedbackParameter const& rhs) { |
return lhs.feedback() == rhs.feedback(); |
} |
-bool operator!=(DataPropertyParameters const& lhs, |
- DataPropertyParameters const& rhs) { |
+bool operator!=(FeedbackParameter const& lhs, FeedbackParameter const& rhs) { |
return !(lhs == rhs); |
} |
-size_t hash_value(DataPropertyParameters const& p) { |
+size_t hash_value(FeedbackParameter const& p) { |
return base::hash_combine(p.feedback()); |
} |
-std::ostream& operator<<(std::ostream& os, DataPropertyParameters const& p) { |
+std::ostream& operator<<(std::ostream& os, FeedbackParameter const& p) { |
return os; |
} |
-DataPropertyParameters const& DataPropertyParametersOf(const Operator* op) { |
+FeedbackParameter const& FeedbackParameterOf(const Operator* op) { |
DCHECK(op->opcode() == IrOpcode::kJSStoreDataPropertyInLiteral); |
- return OpParameter<DataPropertyParameters>(op); |
+ return OpParameter<FeedbackParameter>(op); |
} |
bool operator==(NamedAccess const& lhs, NamedAccess const& rhs) { |
@@ -701,8 +698,8 @@ COMPARE_OP_LIST(COMPARE_OP) |
const Operator* JSOperatorBuilder::StoreDataPropertyInLiteral( |
const VectorSlotPair& feedback) { |
- DataPropertyParameters parameters(feedback); |
- return new (zone()) Operator1<DataPropertyParameters>( // -- |
+ FeedbackParameter parameters(feedback); |
+ return new (zone()) Operator1<FeedbackParameter>( // -- |
IrOpcode::kJSStoreDataPropertyInLiteral, |
Operator::kNoThrow, // opcode |
"JSStoreDataPropertyInLiteral", // name |
@@ -743,8 +740,8 @@ const Operator* JSOperatorBuilder::Call(size_t arity, float frequency, |
} |
const Operator* JSOperatorBuilder::CallWithSpread(uint32_t arity) { |
- SpreadWithArityParameters parameters(arity); |
- return new (zone()) Operator1<SpreadWithArityParameters>( // -- |
+ SpreadWithArityParameter parameters(arity); |
+ return new (zone()) Operator1<SpreadWithArityParameter>( // -- |
IrOpcode::kJSCallWithSpread, Operator::kNoProperties, // opcode |
"JSCallWithSpread", // name |
parameters.arity(), 1, 1, 1, 1, 2, // counts |
@@ -786,8 +783,8 @@ const Operator* JSOperatorBuilder::Construct(uint32_t arity, float frequency, |
} |
const Operator* JSOperatorBuilder::ConstructWithSpread(uint32_t arity) { |
- SpreadWithArityParameters parameters(arity); |
- return new (zone()) Operator1<SpreadWithArityParameters>( // -- |
+ SpreadWithArityParameter parameters(arity); |
+ return new (zone()) Operator1<SpreadWithArityParameter>( // -- |
IrOpcode::kJSConstructWithSpread, Operator::kNoProperties, // opcode |
"JSConstructWithSpread", // name |
parameters.arity(), 1, 1, 1, 1, 2, // counts |