ES6: Add support for method shorthand in object literals

src/code-stubs.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_CODE_STUBS_H_
 #define V8_CODE_STUBS_H_
 
 #include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/codegen.h"
@@ skipping 574 matching lines @@
   static const int kNumber = 0;
 
  private:
   virtual Major MajorKey() const V8_OVERRIDE { return NumberToString; }
   virtual int NotMissMinorKey() const V8_OVERRIDE { return 0; }
 };
 
 
 class FastNewClosureStub : public HydrogenCodeStub {
  public:
-  FastNewClosureStub(Isolate* isolate,
-                     StrictMode strict_mode,
-                     bool is_generator)
+  FastNewClosureStub(Isolate* isolate, StrictMode strict_mode,
+                     FunctionKind kind)
       : HydrogenCodeStub(isolate),
         strict_mode_(strict_mode),
-        is_generator_(is_generator) { }
+        is_generator_(kind == FunctionKind::kGeneratorFunction),
+        is_concise_method_(kind == FunctionKind::kConciseMethod) {}
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   StrictMode strict_mode() const { return strict_mode_; }
   bool is_generator() const { return is_generator_; }
+  bool is_concise_method() const { return is_concise_method_; }
+  FunctionKind kind() const {
+    // TODO(arv): Update to handle concise generator methods.
+    // if (is_arrow()) return FunctionKind::kArrowFunction;
+    if (is_generator()) return FunctionKind::kGeneratorFunction;
+    if (is_concise_method()) return FunctionKind::kConciseMethod;
+    return FunctionKind::kNormalFunction;
+  }
 
  private:
-  class StrictModeBits: public BitField<bool, 0, 1> {};
-  class IsGeneratorBits: public BitField<bool, 1, 1> {};
+  class StrictModeBits : public BitField<bool, 0, 1> {};
+  class IsGeneratorBits : public BitField<bool, 1, 1> {};
+  class IsMethodBits : public BitField<bool, 2, 1> {};
 
   Major MajorKey() const { return FastNewClosure; }
   int NotMissMinorKey() const {
     return StrictModeBits::encode(strict_mode_ == STRICT) |
-      IsGeneratorBits::encode(is_generator_);
+           IsGeneratorBits::encode(is_generator_) |
+           IsMethodBits::encode(is_concise_method_);
   }
 
   StrictMode strict_mode_;
+  // TODO(arv): Maybe store these as bits?
   bool is_generator_;
+  bool is_concise_method_;
 };
 
 
 class FastNewContextStub V8_FINAL : public HydrogenCodeStub {
  public:
   static const int kMaximumSlots = 64;
 
   FastNewContextStub(Isolate* isolate, int slots)
       : HydrogenCodeStub(isolate), slots_(slots) {
     DCHECK(slots_ > 0 && slots_ <= kMaximumSlots);
@@ skipping 1893 matching lines @@
 
 
 class CallDescriptors {
  public:
   static void InitializeForIsolate(Isolate* isolate);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_