Revert r6194: Clean up code for type feedback a bit....

src/ast.h

Index: src/ast.h
===================================================================
--- src/ast.h	(revision 6216)
+++ src/ast.h	(working copy)
@@ -1392,7 +1392,7 @@
                   Expression* left,
                   Expression* right,
                   int pos)
-      : op_(op), left_(left), right_(right), pos_(pos) {
+      : op_(op), left_(left), right_(right), pos_(pos), is_smi_only_(false) {
     ASSERT(Token::IsBinaryOp(op));
     right_id_ = (op == Token::AND || op == Token::OR)
         ? static_cast<int>(GetNextId())
@@ -1413,6 +1413,10 @@
   Expression* right() const { return right_; }
   int position() const { return pos_; }
 
+  // Type feedback information.
+  void RecordTypeFeedback(TypeFeedbackOracle* oracle);
+  bool IsSmiOnly() const { return is_smi_only_; }
+
   // Bailout support.
   int RightId() const { return right_id_; }
 
@@ -1421,6 +1425,7 @@
   Expression* left_;
   Expression* right_;
   int pos_;
+  bool is_smi_only_;
   // The short-circuit logical operations have an AST ID for their
   // right-hand subexpression.
   int right_id_;