Revert 1469 and 1472 due to a bug with array literals.

src/ast.cc

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