Add support for computed property names in object literals

src/ast.cc

 // 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.
 
 #include "src/ast.h"
 
 #include <cmath>  // For isfinite.
 #include "src/builtins.h"
 #include "src/code-stubs.h"
 #include "src/contexts.h"
@@ skipping 163 matching lines @@
       if (shared->start_position() == start_position()) {
         shared_info_ = Handle<SharedFunctionInfo>(shared);
         break;
       }
     }
   }
 }
 
 
 ObjectLiteralProperty::ObjectLiteralProperty(
-    Zone* zone, Literal* key, Expression* value) {
+    Zone* zone, Expression* key, Expression* value, bool is_computed_name) {
   emit_store_ = true;
   key_ = key;
   value_ = value;
-  Handle<Object> k = key->value();
-  if (k->IsInternalizedString() &&
-      String::Equals(Handle<String>::cast(k),
-                     zone->isolate()->factory()->proto_string())) {
-    kind_ = PROTOTYPE;
-  } else if (value_->AsMaterializedLiteral() != NULL) {
-    kind_ = MATERIALIZED_LITERAL;
-  } else if (value_->IsLiteral()) {
-    kind_ = CONSTANT;
+  if (is_computed_name) {
+    kind_ = COMPUTED_NAME;
   } else {
-    kind_ = COMPUTED;
+    Handle<Object> k = key->AsLiteral()->value();
+    if (k->IsInternalizedString() &&
+        String::Equals(Handle<String>::cast(k),
+                       zone->isolate()->factory()->proto_string())) {
+      kind_ = PROTOTYPE;
+    } else if (value_->AsMaterializedLiteral() != NULL) {
+      kind_ = MATERIALIZED_LITERAL;
+    } else if (value_->IsLiteral()) {
+      kind_ = CONSTANT;
+    } else {
+      kind_ = COMPUTED;
+    }
   }
 }
 
 
 ObjectLiteralProperty::ObjectLiteralProperty(
     Zone* zone, bool is_getter, FunctionLiteral* value) {
   emit_store_ = true;
   value_ = value;
   kind_ = is_getter ? GETTER : SETTER;
 }
@@ skipping 16 matching lines @@
 }
 
 
 void ObjectLiteral::CalculateEmitStore(Zone* zone) {
   ZoneAllocationPolicy allocator(zone);
 
   ZoneHashMap table(Literal::Match, ZoneHashMap::kDefaultHashMapCapacity,
                     allocator);
   for (int i = properties()->length() - 1; i >= 0; i--) {
     ObjectLiteral::Property* property = properties()->at(i);
-    Literal* literal = property->key();
+    if (property->kind() == ObjectLiteral::Property::COMPUTED_NAME) continue;
+    Literal* literal = property->key()->AsLiteral();
     if (literal->value()->IsNull()) continue;
     uint32_t hash = literal->Hash();
     // If the key of a computed property is in the table, do not emit
     // a store for the property later.
     if ((property->kind() == ObjectLiteral::Property::MATERIALIZED_LITERAL ||
          property->kind() == ObjectLiteral::Property::COMPUTED) &&
         table.Lookup(literal, hash, false, allocator) != NULL) {
       property->set_emit_store(false);
     } else {
       // Add key to the table.
@@ skipping 21 matching lines @@
   bool is_simple = true;
   int depth_acc = 1;
   uint32_t max_element_index = 0;
   uint32_t elements = 0;
   for (int i = 0; i < properties()->length(); i++) {
     ObjectLiteral::Property* property = properties()->at(i);
     if (!IsBoilerplateProperty(property)) {
       is_simple = false;
       continue;
     }
+
+    if (position == boilerplate_properties_ * 2) {
+      // Constant properties stop at the first computed name.
+      ASSERT(property->kind() == ObjectLiteral::Property::COMPUTED_NAME);
+      break;
+    }
+    ASSERT(property->kind() != ObjectLiteral::Property::COMPUTED_NAME);
+
     MaterializedLiteral* m_literal = property->value()->AsMaterializedLiteral();
     if (m_literal != NULL) {
       m_literal->BuildConstants(isolate);
       if (m_literal->depth() >= depth_acc) depth_acc = m_literal->depth() + 1;
     }
 
     // Add CONSTANT and COMPUTED properties to boilerplate. Use undefined
     // value for COMPUTED properties, the real value is filled in at
     // runtime. The enumeration order is maintained.
-    Handle<Object> key = property->key()->value();
+    Handle<Object> key = property->key()->AsLiteral()->value();
     Handle<Object> value = GetBoilerplateValue(property->value(), isolate);
 
     // Ensure objects that may, at any point in time, contain fields with double
     // representation are always treated as nested objects. This is true for
     // computed fields (value is undefined), and smi and double literals
     // (value->IsNumber()).
     // TODO(verwaest): Remove once we can store them inline.
     if (FLAG_track_double_fields &&
         (value->IsNumber() || value->IsUninitialized())) {
       may_store_doubles_ = true;
@@ skipping 328 matching lines @@
   if (is_monomorphic_) {
     target_ = oracle->GetCallNewTarget(CallNewFeedbackSlot());
     if (!allocation_site_.is_null()) {
       elements_kind_ = allocation_site_->GetElementsKind();
     }
   }
 }
 
 
 void ObjectLiteral::Property::RecordTypeFeedback(TypeFeedbackOracle* oracle) {
-  TypeFeedbackId id = key()->LiteralFeedbackId();
+  ASSERT(key()->IsLiteral());
+  TypeFeedbackId id = key()->AsLiteral()->LiteralFeedbackId();
   SmallMapList maps;
   oracle->CollectReceiverTypes(id, &maps);
   receiver_type_ = maps.length() == 1 ? maps.at(0)
                                       : Handle<Map>::null();
 }
 
 
 // ----------------------------------------------------------------------------
 // Implementation of AstVisitor
 
@@ skipping 503 matching lines @@
     OS::SNPrintF(buffer, "%d", Smi::cast(*value_)->value());
     str = arr;
   } else {
     str = DoubleToCString(value_->Number(), buffer);
   }
   return isolate_->factory()->NewStringFromAsciiChecked(str);
 }
 
 
 } }  // namespace v8::internal