Do not mark decls used, now that unloading tracks deferred decls.

This reduces the number of emitted symbols.
saberduck · Nov 7, 2016 · 46cf799 · 46cf799
2 parents 80db0bc + f6c5426
commit 46cf799
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 52 deletions.
diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
@@ -752,8 +752,6 @@ namespace {
       std::unique_ptr<cling::DeclCollector>
         stateCollector(new cling::DeclCollector());
 
-      // Set up the ASTConsumers
-      CI->getASTContext().setASTMutationListener(stateCollector.get());
       // Add the callback keeping track of the macro definitions
       PP.addPPCallbacks(stateCollector->MakePPAdapter());
       CI->setASTConsumer(std::move(stateCollector));

diff --git a/interpreter/cling/lib/Interpreter/DeclCollector.cpp b/interpreter/cling/lib/Interpreter/DeclCollector.cpp
@@ -73,17 +73,7 @@ namespace cling {
   // pin the vtable here.
   DeclCollector::~DeclCollector() { }
 
-  void DeclCollector::AddedCXXImplicitMember(const CXXRecordDecl *RD,
-                                             const Decl *D) {
-    assert(D->isImplicit());
-    // We need to mark the decls coming from the modules
-    if (comesFromASTReader(RD) || comesFromASTReader(D)) {
-      Decl* implicitD = const_cast<Decl*>(D);
-      implicitD->addAttr(UsedAttr::CreateImplicit(implicitD->getASTContext()));
-    }
-  }
-
-  ASTTransformer::Result DeclCollector::TransformDecl(Decl* D) const {
+ ASTTransformer::Result DeclCollector::TransformDecl(Decl* D) const {
     // We are sure it's safe to pipe it through the transformers
     // Consume late transformers init
     for (size_t i = 0; D && i < m_TransactionTransformers.size(); ++i) {

diff --git a/interpreter/cling/lib/Interpreter/DeclCollector.h b/interpreter/cling/lib/Interpreter/DeclCollector.h
@@ -11,7 +11,6 @@
 #define CLING_DECL_COLLECTOR_H
 
 #include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTMutationListener.h"
 #include "clang/Lex/PPCallbacks.h"
 
 #include "ASTTransformer.h"
@@ -57,8 +56,7 @@ namespace cling {
   /// cling::DeclCollector is responsible for appending all the declarations
   /// seen by clang.
   ///
-  class DeclCollector: public clang::ASTMutationListener,
-                       public clang::ASTConsumer  {
+  class DeclCollector: public clang::ASTConsumer  {
   private:
     ///\brief Contains the transaction AST transformers.
     ///
@@ -120,10 +118,6 @@ namespace cling {
     void MacroDefined(const clang::Token &MacroNameTok,
                               const clang::MacroDirective *MD);
     /// \}
-    /// \name ASTMutationListeners overrides
-    virtual void AddedCXXImplicitMember(const clang::CXXRecordDecl *RD,
-                                        const clang::Decl *D);
-    /// \}
 
     /// \{
     /// \name ASTConsumer overrides

diff --git a/interpreter/cling/lib/Interpreter/IncrementalParser.cpp b/interpreter/cling/lib/Interpreter/IncrementalParser.cpp
@@ -417,31 +417,6 @@ namespace cling {
 
   }
 
-  void IncrementalParser::markWholeTransactionAsUsed(Transaction* T) const {
-    ASTContext& C = m_CI->getASTContext();
-    for (Transaction::const_iterator I = T->decls_begin(), E = T->decls_end();
-         I != E; ++I) {
-      // Copy DCI; it might get relocated below.
-      Transaction::DelayCallInfo DCI = *I;
-      // FIXME: implement for multiple decls in a DGR.
-      assert(DCI.m_DGR.isSingleDecl());
-      Decl* D = DCI.m_DGR.getSingleDecl();
-      if (!D->hasAttr<clang::UsedAttr>())
-        D->addAttr(::new (D->getASTContext())
-                   clang::UsedAttr(D->getSourceRange(), D->getASTContext(),
-                                   0/*AttributeSpellingListIndex*/));
-    }
-    for (Transaction::iterator I = T->deserialized_decls_begin(),
-           E = T->deserialized_decls_end(); I != E; ++I) {
-      // FIXME: implement for multiple decls in a DGR.
-      assert(I->m_DGR.isSingleDecl());
-      Decl* D = I->m_DGR.getSingleDecl();
-      if (!D->hasAttr<clang::UsedAttr>())
-        D->addAttr(::new (C) clang::UsedAttr(D->getSourceRange(), C,
-                                   0/*AttributeSpellingListIndex*/));
-    }
-  }
-
   void IncrementalParser::emitTransaction(Transaction* T) {
     for (auto DI = T->decls_begin(), DE = T->decls_end(); DI != DE; ++DI)
       m_Consumer->HandleTopLevelDecl(DI->m_DGR);

diff --git a/interpreter/cling/lib/Interpreter/IncrementalParser.h b/interpreter/cling/lib/Interpreter/IncrementalParser.h
@@ -192,12 +192,6 @@ namespace cling {
 
     void printTransactionStructure() const;
 
-    ///\brief Adds a UsedAttr to all decls in the transaction.
-    ///
-    ///\param[in] T - the transaction for which all decls will get a UsedAttr.
-    ///
-    void markWholeTransactionAsUsed(Transaction* T) const;
-
     ///\brief Runs the static initializers created by codegening a transaction.
     ///
     ///\param[in] T - the transaction for which to run the initializers.

diff --git a/interpreter/cling/lib/Interpreter/Interpreter.cpp b/interpreter/cling/lib/Interpreter/Interpreter.cpp
@@ -637,7 +637,6 @@ namespace cling {
     assert(!isInSyntaxOnlyMode() && "No CodeGenerator?");
     m_IncrParser->emitTransaction(T);
     m_IncrParser->addTransaction(T);
-    m_IncrParser->markWholeTransactionAsUsed(T);
     T->setState(Transaction::kCollecting);
     auto PRT = m_IncrParser->endTransaction(T);
     m_IncrParser->commitTransaction(PRT);