Version 5.7.4.1 (cherry-pick)

src/compiler/access-info.cc

Index: src/compiler/access-info.cc
diff --git a/src/compiler/access-info.cc b/src/compiler/access-info.cc
index b09f3fa42560585ba942d47cd391fca73e32cd7d..866b06086a2042df0f6a811e25c7fa8a1f36ce62 100644
--- a/src/compiler/access-info.cc
+++ b/src/compiler/access-info.cc
@@ -95,13 +95,6 @@ PropertyAccessInfo PropertyAccessInfo::AccessorConstant(
 }
 
 // static
-PropertyAccessInfo PropertyAccessInfo::FunctionPrototype(
-    MapList const& receiver_maps) {
-  return PropertyAccessInfo(kFunctionPrototype, MaybeHandle<JSObject>(),
-                            Handle<Object>(), receiver_maps);
-}
-
-// static
 PropertyAccessInfo PropertyAccessInfo::Generic(MapList const& receiver_maps) {
   return PropertyAccessInfo(kGeneric, MaybeHandle<JSObject>(), Handle<Object>(),
                             receiver_maps);
@@ -151,6 +144,9 @@ bool PropertyAccessInfo::Merge(PropertyAccessInfo const* that) {
     case kInvalid:
       break;
 
+    case kNotFound:
+      return true;
+
     case kDataField: {
       // Check if we actually access the same field.
       if (this->transition_map_.address() == that->transition_map_.address() &&
@@ -177,9 +173,6 @@ bool PropertyAccessInfo::Merge(PropertyAccessInfo const* that) {
       }
       return false;
     }
-
-    case kNotFound:
-    case kFunctionPrototype:
     case kGeneric: {
       this->receiver_maps_.insert(this->receiver_maps_.end(),
                                   that->receiver_maps_.begin(),
@@ -456,13 +449,6 @@ bool AccessInfoFactory::ComputePropertyAccessInfos(
 
 bool AccessInfoFactory::LookupSpecialFieldAccessor(
     Handle<Map> map, Handle<Name> name, PropertyAccessInfo* access_info) {
-  // Check for Function::prototype accessor.
-  if (map->IsJSFunctionMap() && map->is_constructor() &&
-      name.is_identical_to(factory()->prototype_string())) {
-    DCHECK(!map->has_non_instance_prototype());
-    *access_info = PropertyAccessInfo::FunctionPrototype(MapList{map});
-    return true;
-  }
   // Check for special JSObject field accessors.
   int offset;
   if (Accessors::IsJSObjectFieldAccessor(map, name, &offset)) {