Turbofan: Make type feedback vector a Node.

test/unittests/compiler/js-typed-lowering-unittest.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/code-factory.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/machine-operator.h"
@@ skipping 630 matching lines @@
 
 // -----------------------------------------------------------------------------
 // JSLoadProperty
 
 
 TEST_F(JSTypedLoweringTest, JSLoadPropertyFromExternalTypedArray) {
   const size_t kLength = 17;
   double backing_store[kLength];
   Handle<JSArrayBuffer> buffer =
       NewArrayBuffer(backing_store, sizeof(backing_store));
-  VectorSlotPair feedback(Handle<TypeFeedbackVector>::null(),
-                          FeedbackVectorICSlot::Invalid());
+  ResolvedFeedbackSlot feedback;
   TRACED_FOREACH(ExternalArrayType, type, kExternalArrayTypes) {
     Handle<JSTypedArray> array =
         factory()->NewJSTypedArray(type, buffer, 0, kLength);
     int const element_size = static_cast<int>(array->element_size());
 
     Node* key = Parameter(
         Type::Range(kMinInt / element_size, kMaxInt / element_size, zone()));
     Node* base = HeapConstant(array);
+    Node* vector = UndefinedConstant();
     Node* context = UndefinedConstant();
     Node* effect = graph()->start();
     Node* control = graph()->start();
-    Reduction r = Reduce(graph()->NewNode(javascript()->LoadProperty(feedback),
-                                          base, key, context, EmptyFrameState(),
-                                          EmptyFrameState(), effect, control));
+    Reduction r = Reduce(graph()->NewNode(
+        javascript()->LoadProperty(feedback), base, key, vector, context,
+        EmptyFrameState(), EmptyFrameState(), effect, control));
 
     Matcher<Node*> offset_matcher =
         element_size == 1
             ? key
             : IsWord32Shl(key, IsInt32Constant(WhichPowerOf2(element_size)));
 
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
         IsLoadBuffer(BufferAccess(type),
                      IsIntPtrConstant(bit_cast<intptr_t>(&backing_store[0])),
                      offset_matcher,
                      IsNumberConstant(array->byte_length()->Number()), effect,
                      control));
   }
 }
 
 
 TEST_F(JSTypedLoweringTest, JSLoadPropertyFromExternalTypedArrayWithSafeKey) {
   const size_t kLength = 17;
   double backing_store[kLength];
   Handle<JSArrayBuffer> buffer =
       NewArrayBuffer(backing_store, sizeof(backing_store));
-  VectorSlotPair feedback(Handle<TypeFeedbackVector>::null(),
-                          FeedbackVectorICSlot::Invalid());
+  ResolvedFeedbackSlot feedback;
+

[Michael Starzinger, 2015/06/09 13:23:30]

nit: Drop the empty newline for consistency.

[mvstanton, 2015/06/09 15:21:27]

Done.

   TRACED_FOREACH(ExternalArrayType, type, kExternalArrayTypes) {
     Handle<JSTypedArray> array =
         factory()->NewJSTypedArray(type, buffer, 0, kLength);
     ElementAccess access = AccessBuilder::ForTypedArrayElement(type, true);
 
     int min = random_number_generator()->NextInt(static_cast<int>(kLength));
     int max = random_number_generator()->NextInt(static_cast<int>(kLength));
     if (min > max) std::swap(min, max);
     Node* key = Parameter(Type::Range(min, max, zone()));
     Node* base = HeapConstant(array);
+    Node* vector = UndefinedConstant();
     Node* context = UndefinedConstant();
     Node* effect = graph()->start();
     Node* control = graph()->start();
-    Reduction r = Reduce(graph()->NewNode(javascript()->LoadProperty(feedback),
-                                          base, key, context, EmptyFrameState(),
-                                          EmptyFrameState(), effect, control));
+    Reduction r = Reduce(graph()->NewNode(
+        javascript()->LoadProperty(feedback), base, key, vector, context,
+        EmptyFrameState(), EmptyFrameState(), effect, control));
 
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
         IsLoadElement(access,
                       IsIntPtrConstant(bit_cast<intptr_t>(&backing_store[0])),
                       key, effect, control));
   }
 }
 
@@ skipping 153 matching lines @@
       Handle<String>(isolate()->heap()->infinity_string(), isolate()),
       Handle<String>(isolate()->heap()->nan_string(), isolate())  // --
   };
   Matcher<Node*> matches[] = {
       IsHeapConstant(Unique<HeapObject>::CreateImmovable(
           Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate()))),
       IsNumberConstant(std::numeric_limits<double>::infinity()),
       IsNumberConstant(IsNaN())  // --
   };
 
-  VectorSlotPair feedback(Handle<TypeFeedbackVector>::null(),
-                          FeedbackVectorICSlot::Invalid());
+  ResolvedFeedbackSlot feedback;
   Node* global = Parameter(Type::GlobalObject());
+  Node* vector = UndefinedConstant();
   Node* context = UndefinedConstant();
   Node* effect = graph()->start();
   Node* control = graph()->start();
 
   for (size_t i = 0; i < arraysize(names); i++) {
     Unique<Name> name = Unique<Name>::CreateImmovable(names[i]);
     Reduction r = Reduce(graph()->NewNode(
-        javascript()->LoadNamed(name, feedback), global, context,
+        javascript()->LoadNamed(name, feedback), global, vector, context,
         EmptyFrameState(), EmptyFrameState(), effect, control));
 
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(), matches[i]);
   }
 }
 
 
 // -----------------------------------------------------------------------------
 // JSLoadDynamicGlobal
 
 
 TEST_F(JSTypedLoweringTest, JSLoadDynamicGlobal) {
   Node* const context = Parameter(Type::Any());
+  Node* const vector = UndefinedConstant();
   Node* const frame_state = EmptyFrameState();
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   Handle<String> name = factory()->object_string();
-  VectorSlotPair feedback(Handle<TypeFeedbackVector>::null(),
-                          FeedbackVectorICSlot::Invalid());
+  ResolvedFeedbackSlot feedback;
   for (int i = 0; i < DynamicGlobalAccess::kMaxCheckDepth; ++i) {
     uint32_t bitset = 1 << i;  // Only single check.
     Reduction r = Reduce(graph()->NewNode(
         javascript()->LoadDynamicGlobal(name, bitset, feedback, NOT_CONTEXTUAL),
-        context, context, frame_state, frame_state, effect, control));
+        vector, context, context, frame_state, frame_state, effect, control));
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
         IsPhi(kMachAnyTagged, _, _,
               IsMerge(
                   IsIfTrue(IsBranch(
                       IsReferenceEqual(
                           Type::Tagged(),
                           IsLoadContext(
                               ContextAccess(i, Context::EXTENSION_INDEX, false),
@@ skipping 160 matching lines @@
   EXPECT_THAT(r.replacement(),
               IsFinish(IsAllocate(IsNumberConstant(Context::SizeFor(
                                       Context::MIN_CONTEXT_SLOTS)),
                                   effect, control),
                        _));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8