From d219eda33d659ec70a37d0847a27be38eaf8e2ff Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 6 Apr 2016 20:12:34 +0000
Subject: [PATCH] Minor simplifications.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265594 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/Serialization/ASTWriter.h |  4 +---
 lib/Serialization/ASTWriterDecl.cpp     |  2 +-
 lib/Serialization/ASTWriterStmt.cpp     | 14 +++++---------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/include/clang/Serialization/ASTWriter.h b/include/clang/Serialization/ASTWriter.h
index 08fae78be6..71edfb0f4d 100644
--- a/include/clang/Serialization/ASTWriter.h
+++ b/include/clang/Serialization/ASTWriter.h
@@ -477,9 +477,7 @@ private:
   unsigned getSubmoduleID(Module *Mod);
 
   /// \brief Write the given subexpression to the bitstream.
-  void WriteSubStmt(Stmt *S,
-                    llvm::DenseMap<Stmt *, uint64_t> &SubStmtEntries,
-                    llvm::DenseSet<Stmt *> &ParentStmts);
+  void WriteSubStmt(Stmt *S);
 
   void WriteBlockInfoBlock();
   uint64_t WriteControlBlock(Preprocessor &PP, ASTContext &Context,
diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp
index 3182e2b6f2..21fca17c24 100644
--- a/lib/Serialization/ASTWriterDecl.cpp
+++ b/lib/Serialization/ASTWriterDecl.cpp
@@ -52,7 +52,7 @@ namespace clang {
 
       auto Offset = Record.Emit(Code, AbbrevToUse);
 
-      // Flush any expressions, base specifiers, and ctor initializers that
+      // Flush any base specifiers and ctor initializers that
       // were written as part of this declaration.
       Writer.FlushPendingAfterDecl();
 
diff --git a/lib/Serialization/ASTWriterStmt.cpp b/lib/Serialization/ASTWriterStmt.cpp
index cb4e6146ed..b5bb4211f9 100644
--- a/lib/Serialization/ASTWriterStmt.cpp
+++ b/lib/Serialization/ASTWriterStmt.cpp
@@ -29,7 +29,6 @@ using namespace clang;
 namespace clang {
 
   class ASTStmtWriter : public StmtVisitor<ASTStmtWriter, void> {
-    friend class OMPClauseWriter;
     ASTWriter &Writer;
     ASTRecordWriter Record;
 
@@ -43,7 +42,7 @@ namespace clang {
 
     ASTStmtWriter(const ASTStmtWriter&) = delete;
 
-    uint64_t Emit(Stmt *S) {
+    uint64_t Emit() {
       assert(Code != serialization::STMT_NULL_PTR &&
              "unhandled sub-statement writing AST file");
       return Record.EmitStmt(Code, AbbrevToUse);
@@ -2380,9 +2379,7 @@ void ASTWriter::ClearSwitchCaseIDs() {
 
 /// \brief Write the given substatement or subexpression to the
 /// bitstream.
-void ASTWriter::WriteSubStmt(Stmt *S,
-                             llvm::DenseMap<Stmt *, uint64_t> &SubStmtEntries,
-                             llvm::DenseSet<Stmt *> &ParentStmts) {
+void ASTWriter::WriteSubStmt(Stmt *S) {
   RecordData Record;
   ASTStmtWriter Writer(*this, Record);
   ++NumStatements;
@@ -2420,7 +2417,7 @@ void ASTWriter::WriteSubStmt(Stmt *S,
 
   Writer.Visit(S);
   
-  SubStmtEntries[S] = Writer.Emit(S);
+  SubStmtEntries[S] = Writer.Emit();
 }
 
 /// \brief Flush all of the statements that have been added to the
@@ -2432,7 +2429,7 @@ void ASTRecordWriter::FlushStmts() {
   assert(Writer->ParentStmts.empty() && "unexpected entries in parent stmt map");
 
   for (unsigned I = 0, N = StmtsToEmit.size(); I != N; ++I) {
-    Writer->WriteSubStmt(StmtsToEmit[I], Writer->SubStmtEntries, Writer->ParentStmts);
+    Writer->WriteSubStmt(StmtsToEmit[I]);
     
     assert(N == StmtsToEmit.size() && "record modified while being written!");
 
@@ -2453,8 +2450,7 @@ void ASTRecordWriter::FlushSubStmts() {
   // that a simple stack machine can be used when loading), and don't emit a
   // STMT_STOP after each one.
   for (unsigned I = 0, N = StmtsToEmit.size(); I != N; ++I) {
-    Writer->WriteSubStmt(StmtsToEmit[N - I - 1],
-                         Writer->SubStmtEntries, Writer->ParentStmts);
+    Writer->WriteSubStmt(StmtsToEmit[N - I - 1]);
     assert(N == StmtsToEmit.size() && "record modified while being written!");
   }
 
-- 
2.40.0