Experimental: Merge 1395:1441 from bleeding_edge branch to the...

src/ast.cc

Index: src/ast.cc
===================================================================
--- src/ast.cc	(revision 1441)
+++ src/ast.cc	(working copy)
@@ -135,6 +135,8 @@
   Object* k = *key->handle();
   if (k->IsSymbol() && Heap::Proto_symbol()->Equals(String::cast(k))) {
     kind_ = PROTOTYPE;
+  } else if (value_->AsObjectLiteral() != NULL) {
+    kind_ = OBJECT_LITERAL;
   } else {
     kind_ = value_->AsLiteral() == NULL ? COMPUTED : CONSTANT;
   }