From 1e1728536a4a453c81fad90d94b3b3c0f9dd5897 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 28 Apr 2015 21:05:07 +0000
Subject: [PATCH] Refactor to make MacroState ownership and lifetime clearer.

llvm-svn: 236032
---
 clang/include/clang/Lex/Preprocessor.h | 13 +++++++++++--
 clang/lib/Lex/PPLexerChange.cpp        |  5 ++++-
 clang/lib/Lex/Preprocessor.cpp         |  3 ---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h
index db3231e..c4765f0 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -408,11 +408,20 @@ class Preprocessor : public RefCountedBase<Preprocessor> {
   public:
     MacroState() : MacroState(nullptr) {}
     MacroState(MacroDirective *MD) : State(MD) {}
-    void destroy() {
+    MacroState(MacroState &&O) LLVM_NOEXCEPT : State(O.State) {
+      O.State = (MacroDirective *)nullptr;
+    }
+    MacroState &operator=(MacroState &&O) LLVM_NOEXCEPT {
+      auto S = O.State;
+      O.State = (MacroDirective *)nullptr;
+      State = S;
+      return *this;
+    }
+    ~MacroState() {
       if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
         Info->~ModuleMacroInfo();
-      State = (MacroDirective*)nullptr;
     }
+
     MacroDirective *getLatest() const {
       if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
         return Info->MD;
diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp
index 57110aa..3f0c2bb 100644
--- a/clang/lib/Lex/PPLexerChange.cpp
+++ b/clang/lib/Lex/PPLexerChange.cpp
@@ -638,6 +638,8 @@ void Preprocessor::LeaveSubmodule() {
     bool ExplicitlyPublic = false;
     for (auto *MD = Macro.second.getLatest(); MD != SavedInfo.Latest;
          MD = MD->getPrevious()) {
+      assert(MD && "broken macro directive chain");
+
       // Skip macros defined in other submodules we #included along the way.
       Module *Mod = getModuleContainingLocation(MD->getLocation());
       if (Mod != Info.M)
@@ -673,7 +675,8 @@ void Preprocessor::LeaveSubmodule() {
     Info.M->NameVisibility = Module::MacrosVisible;
     Info.M->MacroVisibilityLoc = Info.ImportLoc;
     ++MacroVisibilityGeneration;
-    // FIXME: Also mark any exported macros as visible, and check for conflicts.
+    // FIXME: Also mark any exported modules as visible, and check for
+    // conflicts.
   }
 
   BuildingSubmoduleStack.pop_back();
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp
index 80715d5..92ab2af 100644
--- a/clang/lib/Lex/Preprocessor.cpp
+++ b/clang/lib/Lex/Preprocessor.cpp
@@ -142,9 +142,6 @@ Preprocessor::Preprocessor(IntrusiveRefCntPtr<PreprocessorOptions> PPOpts,
 Preprocessor::~Preprocessor() {
   assert(BacktrackPositions.empty() && "EnableBacktrack/Backtrack imbalance!");
 
-  for (auto &Macro : Macros)
-    Macro.second.destroy();
-
   IncludeMacroStack.clear();
 
   // Destroy any macro definitions.
-- 
2.7.4