commit 9941da41918fde4e1d1afe6923f122bea3e99597
author David Blaikie <dblaikie@gmail.com> Sat Nov 17 18:04:13 2018 +0000
committer David Blaikie <dblaikie@gmail.com> Sat Nov 17 18:04:13 2018 +0000
tree 4bea587ff459e0a3c9961ebf7928d9b878d5b2c6
parent ef543381ed713c1dce381d064812194bf3ae8e6b

Sink BuryPointer from Clang into LLVM for reuse there

llvm-svn: 347141

clang/lib/Frontend/FrontendAction.cpp

diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index fc6c2e7..83152bd 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -26,6 +26,7 @@
 #include "clang/Serialization/ASTDeserializationListener.h"
 #include "clang/Serialization/ASTReader.h"
 #include "clang/Serialization/GlobalModuleIndex.h"
+#include "llvm/Support/BuryPointer.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
@@ -949,7 +950,7 @@
   if (DisableFree) {
     CI.resetAndLeakSema();
     CI.resetAndLeakASTContext();
-    BuryPointer(CI.takeASTConsumer().get());
+    llvm::BuryPointer(CI.takeASTConsumer().get());
   } else {
     CI.setSema(nullptr);
     CI.setASTContext(nullptr);
@@ -974,7 +975,7 @@
       CI.resetAndLeakPreprocessor();
       CI.resetAndLeakSourceManager();
       CI.resetAndLeakFileManager();
-      BuryPointer(CurrentASTUnit.release());
+      llvm::BuryPointer(std::move(CurrentASTUnit));
     } else {
       CI.setPreprocessor(nullptr);
       CI.setSourceManager(nullptr);