summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2014-08-10 19:14:48 +0000
committerDavid Blaikie <dblaikie@gmail.com>2014-08-10 19:14:48 +0000
commitec99b5ee0d2bc7abe297738ff3af1d7e9ce461fb (patch)
tree0ea3b01922ebd754ce0a461dcae18597f46e1179
parent6f7382ddd11db36df6b7f08324134ec1a54e0a5e (diff)
downloadbcm5719-llvm-ec99b5ee0d2bc7abe297738ff3af1d7e9ce461fb.tar.gz
bcm5719-llvm-ec99b5ee0d2bc7abe297738ff3af1d7e9ce461fb.zip
unique_ptr-ify CompilerInstance::takeSema
llvm-svn: 215321
-rw-r--r--clang/include/clang/Frontend/CompilerInstance.h2
-rw-r--r--clang/lib/Frontend/ASTUnit.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Frontend/CompilerInstance.h b/clang/include/clang/Frontend/CompilerInstance.h
index 44e91026acb..413c3600b50 100644
--- a/clang/include/clang/Frontend/CompilerInstance.h
+++ b/clang/include/clang/Frontend/CompilerInstance.h
@@ -459,7 +459,7 @@ public:
return *TheSema;
}
- Sema *takeSema() { return TheSema.release(); }
+ std::unique_ptr<Sema> takeSema() { return std::move(TheSema); }
void resetAndLeakSema() { BuryPointer(TheSema.release()); }
/// }
diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 9505c0769fe..78d86d4b653 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -1684,7 +1684,7 @@ void ASTUnit::transferASTDataFromCompilerInstance(CompilerInstance &CI) {
// created.
assert(CI.hasInvocation() && "missing invocation");
LangOpts = CI.getInvocation().LangOpts;
- TheSema.reset(CI.takeSema());
+ TheSema = CI.takeSema();
Consumer.reset(CI.takeASTConsumer());
if (CI.hasASTContext())
Ctx = &CI.getASTContext();
OpenPOWER on IntegriCloud