Add support for computed property names in object literals

src/x87/full-codegen-x87.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/v8.h"
 
 #if V8_TARGET_ARCH_X87
 
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ skipping 1608 matching lines @@
   // If result_saved is true the result is on top of the stack.  If
   // result_saved is false the result is in eax.
   bool result_saved = false;
 
   // Mark all computed expressions that are bound to a key that
   // is shadowed by a later occurrence of the same key. For the
   // marked expressions, no store code is emitted.
   expr->CalculateEmitStore(zone());
 
   AccessorTable accessor_table(zone());
+  bool has_seen_computed_name = false;
   for (int i = 0; i < expr->properties()->length(); i++) {
     ObjectLiteral::Property* property = expr->properties()->at(i);
-    if (property->IsCompileTimeValue()) continue;
 
-    Literal* key = property->key();
+    if (!has_seen_computed_name && property->IsCompileTimeValue()) {
+      continue;
+    }
+    if (property->kind() == ObjectLiteral::Property::COMPUTED_NAME) {
+      has_seen_computed_name = true;
+    }
+
+    Literal* literal_key = property->key()->AsLiteral();
     Expression* value = property->value();
     if (!result_saved) {
       __ push(eax);  // Save result on the stack
       result_saved = true;
     }
     switch (property->kind()) {
       case ObjectLiteral::Property::CONSTANT:
-        UNREACHABLE();
+        ASSERT(has_seen_computed_name);
+        // Fall through.
       case ObjectLiteral::Property::MATERIALIZED_LITERAL:
-        ASSERT(!CompileTimeValue::IsCompileTimeValue(value));
+        ASSERT(has_seen_computed_name ||
+               !CompileTimeValue::IsCompileTimeValue(value));
         // Fall through.
       case ObjectLiteral::Property::COMPUTED:
-        if (key->value()->IsInternalizedString()) {
+        if (literal_key->value()->IsInternalizedString()) {
           if (property->emit_store()) {
             VisitForAccumulatorValue(value);
-            __ mov(ecx, Immediate(key->value()));
+            __ mov(ecx, Immediate(literal_key->value()));
             __ mov(edx, Operand(esp, 0));
-            CallStoreIC(key->LiteralFeedbackId());
-            PrepareForBailoutForId(key->id(), NO_REGISTERS);
+            CallStoreIC(literal_key->LiteralFeedbackId());
+            PrepareForBailoutForId(literal_key->id(), NO_REGISTERS);
           } else {
             VisitForEffect(value);
           }
           break;
         }
+        // Fall through.
+      case ObjectLiteral::Property::COMPUTED_NAME:
         __ push(Operand(esp, 0));  // Duplicate receiver.
-        VisitForStackValue(key);
+        VisitForStackValue(property->key());
         VisitForStackValue(value);
         if (property->emit_store()) {
           __ push(Immediate(Smi::FromInt(NONE)));  // PropertyAttributes
           __ CallRuntime(Runtime::kSetProperty, 4);
         } else {
           __ Drop(3);
         }
         break;
       case ObjectLiteral::Property::PROTOTYPE:
         __ push(Operand(esp, 0));  // Duplicate receiver.
         VisitForStackValue(value);
         if (property->emit_store()) {
           __ CallRuntime(Runtime::kSetPrototype, 2);
         } else {
           __ Drop(2);
         }
         break;
       case ObjectLiteral::Property::GETTER:
-        accessor_table.lookup(key)->second->getter = value;
+        accessor_table.lookup(literal_key)->second->getter = value;
         break;
       case ObjectLiteral::Property::SETTER:
-        accessor_table.lookup(key)->second->setter = value;
+        accessor_table.lookup(literal_key)->second->setter = value;
         break;
     }
   }
 
   // Emit code to define accessors, using only a single call to the runtime for
   // each pair of corresponding getters and setters.
   for (AccessorTable::Iterator it = accessor_table.begin();
        it != accessor_table.end();
        ++it) {
     __ push(Operand(esp, 0));  // Duplicate receiver.
@@ skipping 3104 matching lines @@
   ASSERT_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
             Assembler::target_address_at(call_target_address,
                                          unoptimized_code));
   return OSR_AFTER_STACK_CHECK;
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X87