| Index: src/compiler/js-operator.cc
|
| diff --git a/src/compiler/js-operator.cc b/src/compiler/js-operator.cc
|
| index a360a279acb29116f8a6c4df027c8b162134268b..4109681ad8f6c92a5da58ca85d99d398559bf114 100644
|
| --- a/src/compiler/js-operator.cc
|
| +++ b/src/compiler/js-operator.cc
|
| @@ -191,6 +191,7 @@ size_t hash_value(VectorSlotPair const& p) {
|
| bool operator==(LoadNamedParameters const& lhs,
|
| LoadNamedParameters const& rhs) {
|
| return lhs.name() == rhs.name() &&
|
| + lhs.language_mode() == rhs.language_mode() &&
|
| lhs.contextual_mode() == rhs.contextual_mode() &&
|
| lhs.feedback() == rhs.feedback();
|
| }
|
| @@ -203,24 +204,26 @@ bool operator!=(LoadNamedParameters const& lhs,
|
|
|
|
|
| size_t hash_value(LoadNamedParameters const& p) {
|
| - return base::hash_combine(p.name(), p.contextual_mode(), p.feedback());
|
| + return base::hash_combine(
|
| + p.name(), p.language_mode(), p.contextual_mode(), p.feedback());
|
| }
|
|
|
|
|
| std::ostream& operator<<(std::ostream& os, LoadNamedParameters const& p) {
|
| - return os << Brief(*p.name().handle()) << ", " << p.contextual_mode();
|
| + return os << Brief(*p.name().handle()) << ", " << p.language_mode()
|
| + << ", " << p.contextual_mode();
|
| }
|
|
|
|
|
| std::ostream& operator<<(std::ostream& os, LoadPropertyParameters const& p) {
|
| - // Nothing special to print.
|
| - return os;
|
| + return os << p.language_mode();
|
| }
|
|
|
|
|
| bool operator==(LoadPropertyParameters const& lhs,
|
| LoadPropertyParameters const& rhs) {
|
| - return lhs.feedback() == rhs.feedback();
|
| + return lhs.language_mode() == rhs.language_mode() &&
|
| + lhs.feedback() == rhs.feedback();
|
| }
|
|
|
|
|
| @@ -237,7 +240,7 @@ const LoadPropertyParameters& LoadPropertyParametersOf(const Operator* op) {
|
|
|
|
|
| size_t hash_value(LoadPropertyParameters const& p) {
|
| - return hash_value(p.feedback());
|
| + return base::hash_combine(p.language_mode(), p.feedback());
|
| }
|
|
|
|
|
| @@ -460,8 +463,10 @@ const Operator* JSOperatorBuilder::CallConstruct(int arguments) {
|
|
|
| const Operator* JSOperatorBuilder::LoadNamed(const Unique<Name>& name,
|
| const VectorSlotPair& feedback,
|
| + LanguageMode language_mode,
|
| ContextualMode contextual_mode) {
|
| - LoadNamedParameters parameters(name, feedback, contextual_mode);
|
| + LoadNamedParameters parameters(name, feedback, language_mode,
|
| + contextual_mode);
|
| return new (zone()) Operator1<LoadNamedParameters>( // --
|
| IrOpcode::kJSLoadNamed, Operator::kNoProperties, // opcode
|
| "JSLoadNamed", // name
|
| @@ -470,9 +475,9 @@ const Operator* JSOperatorBuilder::LoadNamed(const Unique<Name>& name,
|
| }
|
|
|
|
|
| -const Operator* JSOperatorBuilder::LoadProperty(
|
| - const VectorSlotPair& feedback) {
|
| - LoadPropertyParameters parameters(feedback);
|
| +const Operator* JSOperatorBuilder::LoadProperty(const VectorSlotPair& feedback,
|
| + LanguageMode language_mode) {
|
| + LoadPropertyParameters parameters(feedback, language_mode);
|
| return new (zone()) Operator1<LoadPropertyParameters>( // --
|
| IrOpcode::kJSLoadProperty, Operator::kNoProperties, // opcode
|
| "JSLoadProperty", // name
|
|
|