Arrow functions: Cleanup handling of the prototype property

src/contexts.h

 // Copyright 2012 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.
 
 #ifndef V8_CONTEXTS_H_
 #define V8_CONTEXTS_H_
 
 #include "src/heap/heap.h"
 #include "src/objects.h"
 
@@ skipping 541 matching lines @@
   static int SlotOffset(int index) {
     return kHeaderSize + index * kPointerSize - kHeapObjectTag;
   }
 
   static int FunctionMapIndex(StrictMode strict_mode, FunctionKind kind) {
     if (IsGeneratorFunction(kind)) {
       return strict_mode == SLOPPY ? SLOPPY_GENERATOR_FUNCTION_MAP_INDEX
                                    : STRICT_GENERATOR_FUNCTION_MAP_INDEX;
     }
 
-    if (IsConciseMethod(kind)) {
+    if (IsArrowFunction(kind) || IsConciseMethod(kind)) {
       return strict_mode == SLOPPY
                  ? SLOPPY_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX
                  : STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX;
     }
 
     return strict_mode == SLOPPY ? SLOPPY_FUNCTION_MAP_INDEX
                                  : STRICT_FUNCTION_MAP_INDEX;
   }
 
   static const int kSize = kHeaderSize + NATIVE_CONTEXT_SLOTS * kPointerSize;
@@ skipping 17 matching lines @@
   static bool IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object);
 #endif
 
   STATIC_ASSERT(kHeaderSize == Internals::kContextHeaderSize);
   STATIC_ASSERT(EMBEDDER_DATA_INDEX == Internals::kContextEmbedderDataIndex);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CONTEXTS_H_