[turbofan] Don't mix up named/property accesses.

src/compiler/js-type-feedback.cc

 // Copyright 2015 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-type-feedback.h"
 
 #include "src/property-details.h"
 
 #include "src/accessors.h"
 #include "src/ast.h"
@@ skipping 30 matching lines @@
 }
 
 
 void JSTypeFeedbackTable::Record(Node* node, FeedbackVectorICSlot slot) {
   feedback_vector_ic_slot_map_.insert(std::make_pair(node->id(), slot));
 }
 
 
 Reduction JSTypeFeedbackSpecializer::Reduce(Node* node) {
   switch (node->opcode()) {
-    case IrOpcode::kJSLoadProperty: {
-      HeapObjectMatcher<Name> match(node->InputAt(1));
-      if (match.HasValue() && match.Value().handle()->IsName()) {
-        // LoadProperty(o, "constant") => LoadNamed["constant"](o).
-        Unique<Name> name = match.Value();
-        const VectorSlotPair& feedback =
-            LoadPropertyParametersOf(node->op()).feedback();
-        node->set_op(jsgraph()->javascript()->LoadNamed(name, feedback,
-                                                        NOT_CONTEXTUAL, KEYED));
-        node->RemoveInput(1);
-        return ReduceJSLoadNamed(node);
-      }
+    case IrOpcode::kJSLoadProperty:
       return ReduceJSLoadProperty(node);
-    }
     case IrOpcode::kJSLoadNamed:
       return ReduceJSLoadNamed(node);
     case IrOpcode::kJSStoreNamed:
       return ReduceJSStoreNamed(node);
-    case IrOpcode::kJSStoreProperty: {
-      HeapObjectMatcher<Name> match(node->InputAt(1));
-      if (match.HasValue() && match.Value().handle()->IsName()) {
-        // StoreProperty(o, "constant", v) => StoreNamed["constant"](o, v).
-        Unique<Name> name = match.Value();
-        LanguageMode language_mode = OpParameter<LanguageMode>(node);
-        node->set_op(
-            jsgraph()->javascript()->StoreNamed(language_mode, name, KEYED));
-        node->RemoveInput(1);
-        return ReduceJSStoreNamed(node);
-      }
+    case IrOpcode::kJSStoreProperty:
       return ReduceJSStoreProperty(node);
-    }
     default:
       break;
   }
   return NoChange();
 }
 
 
 static void AddFieldAccessTypes(FieldAccess* access,
                                 PropertyDetails property_details) {
   if (property_details.representation().IsSmi()) {
@@ skipping 88 matching lines @@
   const LoadNamedParameters& p = LoadNamedParametersOf(node->op());
   Handle<Name> name = p.name().handle();
   SmallMapList maps;
 
   FeedbackVectorICSlot slot = js_type_feedback_->FindFeedbackVectorICSlot(node);
   if (slot.IsInvalid() ||
       oracle()->LoadInlineCacheState(slot) == UNINITIALIZED) {
     // No type feedback ids or the load is uninitialized.
     return NoChange();
   }
-  if (p.load_ic() == NAMED) {
-    oracle()->PropertyReceiverTypes(slot, name, &maps);
-  } else {
-    // The load named was originally a load property.
-    bool is_string;        // Unused.
-    IcCheckType key_type;  // Unused.
-    oracle()->KeyedPropertyReceiverTypes(slot, &maps, &is_string, &key_type);
-  }
+  oracle()->PropertyReceiverTypes(slot, name, &maps);
 
   Node* effect = NodeProperties::GetEffectInput(node);
 
   if (maps.length() != 1) return NoChange();  // TODO(turbofan): polymorphism
   if (!ENABLE_FAST_PROPERTY_LOADS) return NoChange();
 
   Handle<Map> map = maps.first();
   FieldAccess field_access;
   if (!GetInObjectFieldAccess(LOAD, map, name, &field_access)) {
     return NoChange();
@@ skipping 98 matching lines @@
 
   const StoreNamedParameters& p = StoreNamedParametersOf(node->op());
   Handle<Name> name = p.name().handle();
   SmallMapList maps;
   TypeFeedbackId id = js_type_feedback_->FindTypeFeedbackId(node);
   if (id.IsNone() || oracle()->StoreIsUninitialized(id) == UNINITIALIZED) {
     // No type feedback ids or the store is uninitialized.
     // TODO(titzer): no feedback from vector ICs from stores.
     return NoChange();
   } else {
-    if (p.store_ic() == NAMED) {
-      oracle()->PropertyReceiverTypes(id, name, &maps);
-    } else {
-      // The named store was originally a store property.
-      bool is_string;        // Unused.
-      IcCheckType key_type;  // Unused.
-      oracle()->KeyedPropertyReceiverTypes(id, &maps, &is_string, &key_type);
-    }
+    oracle()->PropertyReceiverTypes(id, name, &maps);
   }
 
   Node* receiver = node->InputAt(0);
   Node* effect = NodeProperties::GetEffectInput(node);
 
   if (maps.length() != 1) return NoChange();  // TODO(turbofan): polymorphism
 
   if (!ENABLE_FAST_PROPERTY_STORES) return NoChange();
 
   Handle<Map> map = maps.first();
@@ skipping 68 matching lines @@
       BailoutId id = OpParameter<FrameStateCallInfo>(node).bailout_id();
       if (id != BailoutId::None()) return frame_state;
     }
   }
   return nullptr;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8