Revert "Merge remote-tracking branch 'aosp/upstream'"

This reverts commit 59ce30d7b247cfc41950e2cc5438a1bff66bdc1f.

This looks the culprit of b/27381403. As I haven't figured out
the cause yet, let's just revert this for now.

Bug: 27381403
Change-Id: Ifd25a24b4bd7f2922ce76d6a05f85723074848ea

1 files changed, 0 insertions, 9 deletions

diff --git a/stmt.h b/stmt.h
index 3b6feeb..4d4c5eb 100644
--- a/stmt.h
+++ b/stmt.h
@@ -20,7 +20,6 @@
 
 #include "loc.h"
 #include "string_piece.h"
-#include "symtab.h"
 
 using namespace std;
 
@@ -86,19 +85,11 @@ struct AssignStmt : public Stmt {
   AssignOp op;
   AssignDirective directive;
 
-  AssignStmt()
-      : lhs_sym_cache_(Symbol::IsUninitialized{}) {
-  }
   virtual ~AssignStmt();
 
   virtual void Eval(Evaluator* ev) const;
 
   virtual string DebugString() const;
-
-  Symbol GetLhsSymbol(Evaluator* ev) const;
-
- private:
-  mutable Symbol lhs_sym_cache_;
 };
 
 struct CommandStmt : public Stmt {