From bd3306aecb3a15e8967143b8cdbbccf2b1b19b74 Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Sat, 14 Jan 2017 19:55:43 +0000
Subject: Import LLVM 3.9.1 including clang and lld.

---
 gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp')

diff --git a/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp b/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
index b499fa2b0e6..51064da270c 100644
--- a/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
+++ b/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
@@ -83,14 +83,13 @@ void ASTMergeAction::EndSourceFileAction() {
   return AdaptedAction->EndSourceFileAction();
 }
 
-ASTMergeAction::ASTMergeAction(FrontendAction *AdaptedAction,
+ASTMergeAction::ASTMergeAction(std::unique_ptr<FrontendAction> adaptedAction,
                                ArrayRef<std::string> ASTFiles)
-  : AdaptedAction(AdaptedAction), ASTFiles(ASTFiles.begin(), ASTFiles.end()) {
+: AdaptedAction(std::move(adaptedAction)), ASTFiles(ASTFiles.begin(), ASTFiles.end()) {
   assert(AdaptedAction && "ASTMergeAction needs an action to adapt");
 }
 
 ASTMergeAction::~ASTMergeAction() { 
-  delete AdaptedAction;
 }
 
 bool ASTMergeAction::usesPreprocessorOnly() const {
-- 
cgit v1.2.3-59-g8ed1b