Merged: [builtins] add context input to users of CreateKeyValueArray opcode

src/compiler/js-builtin-reducer.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/js-builtin-reducer.h"
 
 #include "src/compilation-dependencies.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 416 matching lines @@
                                    value);
         } else if (elements_kind == FAST_HOLEY_DOUBLE_ELEMENTS) {
           // TODO(bmeurer): avoid deopt if not all uses of value are truncated.
           CheckFloat64HoleMode mode = CheckFloat64HoleMode::kAllowReturnHole;
           value = etrue1 = graph()->NewNode(
               simplified()->CheckFloat64Hole(mode), value, etrue1, if_true1);
         }
 
         if (kind == IterationKind::kEntries) {
           // Allocate elements for key/value pair
-          vtrue1 = etrue1 = graph()->NewNode(
-              javascript()->CreateKeyValueArray(), index, value, etrue1);
+          vtrue1 = etrue1 =
+              graph()->NewNode(javascript()->CreateKeyValueArray(), index,
+                               value, context, etrue1);
         } else {
           DCHECK_EQ(kind, IterationKind::kValues);
           vtrue1 = value;
         }
       }
 
       Node* next_index = graph()->NewNode(simplified()->NumberAdd(), index,
                                           jsgraph()->OneConstant());
       next_index = graph()->NewNode(simplified()->NumberToUint32(), next_index);
 
@@ skipping 145 matching lines @@
             UNREACHABLE();
 #undef TYPED_ARRAY_CASE
         }
 
         Node* value = etrue2 =
             graph()->NewNode(simplified()->LoadTypedElement(array_type), buffer,
                              base_ptr, external_ptr, index, etrue2, if_true2);
 
         if (kind == IterationKind::kEntries) {
           // Allocate elements for key/value pair
-          vtrue2 = etrue2 = graph()->NewNode(
-              javascript()->CreateKeyValueArray(), index, value, etrue2);
+          vtrue2 = etrue2 =
+              graph()->NewNode(javascript()->CreateKeyValueArray(), index,
+                               value, context, etrue2);
         } else {
           DCHECK(kind == IterationKind::kValues);
           vtrue2 = value;
         }
       }
     }
 
     Node* vdone_false2;
     Node* vfalse2;
     Node* efalse2 = efalse0;
@@ skipping 1398 matching lines @@
   return jsgraph()->simplified();
 }
 
 JSOperatorBuilder* JSBuiltinReducer::javascript() const {
   return jsgraph()->javascript();
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8