Skip to content

Commit a51666a

Browse files
dwblaikiedwblaikie
committed
unique_ptr-ify ownership of ASTConsumers
(after fixing a bug in MultiplexConsumer I noticed the ownership of the nested consumers was implemented with raw pointers - so this fixes that... and follows the source back to its origin pushing unique_ptr ownership up through there too) llvm-svn: 213307
1 parent fa59e62 commit a51666a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+346
-338
lines changed

‎clang/examples/PrintFunctionNames/PrintFunctionNames.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ class PrintFunctionsConsumer : public ASTConsumer {
3636

3737
class PrintFunctionNamesAction : public PluginASTAction {
3838
protected:
39-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI, llvm::StringRef) {
40-
return new PrintFunctionsConsumer();
39+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
40+
llvm::StringRef) {
41+
return llvm::make_unique<PrintFunctionsConsumer>();
4142
}
4243

4344
bool ParseArgs(const CompilerInstance &CI,

‎clang/include/clang/ARCMigrate/ARCMTActions.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class MigrateSourceAction : public ASTFrontendAction {
3737
FileRemapper Remapper;
3838
protected:
3939
bool BeginInvocation(CompilerInstance &CI) override;
40-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
41-
StringRef InFile) override;
40+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
41+
StringRef InFile) override;
4242
};
4343

4444
class MigrateAction : public WrapperFrontendAction {
@@ -65,8 +65,8 @@ class ObjCMigrateAction : public WrapperFrontendAction {
6565
unsigned migrateAction);
6666

6767
protected:
68-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
69-
StringRef InFile) override;
68+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
69+
StringRef InFile) override;
7070
bool BeginInvocation(CompilerInstance &CI) override;
7171
};
7272

‎clang/include/clang/ASTMatchers/ASTMatchFinder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class MatchFinder {
148148
MatchCallback *Action);
149149

150150
/// \brief Creates a clang ASTConsumer that finds all matches.
151-
clang::ASTConsumer *newASTConsumer();
151+
std::unique_ptr<clang::ASTConsumer> newASTConsumer();
152152

153153
/// \brief Calls the registered callbacks on all matches on the given \p Node.
154154
///

‎clang/include/clang/CodeGen/CodeGenAction.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class CodeGenAction : public ASTFrontendAction {
3737

3838
bool hasIRSupport() const override;
3939

40-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
41-
StringRef InFile) override;
40+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
41+
StringRef InFile) override;
4242

4343
void ExecuteAction() override;
4444

‎clang/include/clang/Frontend/ASTConsumers.h‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include "clang/Basic/LLVM.h"
1818

19+
#include <memory>
20+
1921
namespace clang {
2022

2123
class ASTConsumer;
@@ -30,24 +32,26 @@ class TargetOptions;
3032
// original C code. The output is intended to be in a format such that
3133
// clang could re-parse the output back into the same AST, but the
3234
// implementation is still incomplete.
33-
ASTConsumer *CreateASTPrinter(raw_ostream *OS, StringRef FilterString);
35+
std::unique_ptr<ASTConsumer> CreateASTPrinter(raw_ostream *OS,
36+
StringRef FilterString);
3437

3538
// AST dumper: dumps the raw AST in human-readable form to stderr; this is
3639
// intended for debugging.
37-
ASTConsumer *CreateASTDumper(StringRef FilterString, bool DumpLookups = false);
40+
std::unique_ptr<ASTConsumer> CreateASTDumper(StringRef FilterString,
41+
bool DumpLookups = false);
3842

3943
// AST Decl node lister: prints qualified names of all filterable AST Decl
4044
// nodes.
41-
ASTConsumer *CreateASTDeclNodeLister();
45+
std::unique_ptr<ASTConsumer> CreateASTDeclNodeLister();
4246

4347
// Graphical AST viewer: for each function definition, creates a graph of
4448
// the AST and displays it with the graph viewer "dotty". Also outputs
4549
// function declarations to stderr.
46-
ASTConsumer *CreateASTViewer();
50+
std::unique_ptr<ASTConsumer> CreateASTViewer();
4751

4852
// DeclContext printer: prints out the DeclContext tree in human-readable form
4953
// to stderr; this is intended for debugging.
50-
ASTConsumer *CreateDeclContextPrinter();
54+
std::unique_ptr<ASTConsumer> CreateDeclContextPrinter();
5155

5256
} // end clang namespace
5357

‎clang/include/clang/Frontend/CompilerInstance.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "clang/Basic/SourceManager.h"
1515
#include "clang/Frontend/CompilerInvocation.h"
1616
#include "clang/Frontend/Utils.h"
17+
#include "clang/AST/ASTConsumer.h"
1718
#include "clang/Lex/ModuleLoader.h"
1819
#include "llvm/ADT/ArrayRef.h"
1920
#include "llvm/ADT/DenseMap.h"
@@ -443,11 +444,11 @@ class CompilerInstance : public ModuleLoader {
443444

444445
/// takeASTConsumer - Remove the current AST consumer and give ownership to
445446
/// the caller.
446-
ASTConsumer *takeASTConsumer() { return Consumer.release(); }
447+
std::unique_ptr<ASTConsumer> takeASTConsumer() { return std::move(Consumer); }
447448

448449
/// setASTConsumer - Replace the current AST consumer; the compiler instance
449450
/// takes ownership of \p Value.
450-
void setASTConsumer(ASTConsumer *Value);
451+
void setASTConsumer(std::unique_ptr<ASTConsumer> Value);
451452

452453
/// }
453454
/// @name Semantic analysis

‎clang/include/clang/Frontend/FrontendAction.h‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class FrontendAction {
4141
friend class WrapperFrontendAction;
4242

4343
private:
44-
ASTConsumer* CreateWrappedASTConsumer(CompilerInstance &CI,
45-
StringRef InFile);
44+
std::unique_ptr<ASTConsumer> CreateWrappedASTConsumer(CompilerInstance &CI,
45+
StringRef InFile);
4646

4747
protected:
4848
/// @name Implementation Action Interface
@@ -61,8 +61,8 @@ class FrontendAction {
6161
/// getCurrentFile().
6262
///
6363
/// \return The new AST consumer, or null on failure.
64-
virtual ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
65-
StringRef InFile) = 0;
64+
virtual std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
65+
StringRef InFile) = 0;
6666

6767
/// \brief Callback before starting processing a single input, giving the
6868
/// opportunity to modify the CompilerInvocation or do some other action
@@ -227,11 +227,10 @@ class ASTFrontendAction : public FrontendAction {
227227

228228
class PluginASTAction : public ASTFrontendAction {
229229
virtual void anchor();
230-
protected:
231-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
232-
StringRef InFile) override = 0;
233-
234230
public:
231+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
232+
StringRef InFile) override = 0;
233+
235234
/// \brief Parse the given plugin command line arguments.
236235
///
237236
/// \param CI - The compiler instance, for use in reporting diagnostics.
@@ -247,8 +246,8 @@ class PreprocessorFrontendAction : public FrontendAction {
247246
protected:
248247
/// \brief Provide a default implementation which returns aborts;
249248
/// this method should never be called by FrontendAction clients.
250-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
251-
StringRef InFile) override;
249+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
250+
StringRef InFile) override;
252251

253252
public:
254253
bool usesPreprocessorOnly() const override { return true; }
@@ -264,8 +263,8 @@ class WrapperFrontendAction : public FrontendAction {
264263
std::unique_ptr<FrontendAction> WrappedAction;
265264

266265
protected:
267-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
268-
StringRef InFile) override;
266+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
267+
StringRef InFile) override;
269268
bool BeginInvocation(CompilerInstance &CI) override;
270269
bool BeginSourceFileAction(CompilerInstance &CI, StringRef Filename) override;
271270
void ExecuteAction() override;

‎clang/include/clang/Frontend/FrontendActions.h‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class FileEntry;
2626
class InitOnlyAction : public FrontendAction {
2727
void ExecuteAction() override;
2828

29-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
30-
StringRef InFile) override;
29+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
30+
StringRef InFile) override;
3131

3232
public:
3333
// Don't claim to only use the preprocessor, we want to follow the AST path,
@@ -41,38 +41,38 @@ class InitOnlyAction : public FrontendAction {
4141

4242
class ASTPrintAction : public ASTFrontendAction {
4343
protected:
44-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
45-
StringRef InFile) override;
44+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
45+
StringRef InFile) override;
4646
};
4747

4848
class ASTDumpAction : public ASTFrontendAction {
4949
protected:
50-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
51-
StringRef InFile) override;
50+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
51+
StringRef InFile) override;
5252
};
5353

5454
class ASTDeclListAction : public ASTFrontendAction {
5555
protected:
56-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
57-
StringRef InFile) override;
56+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
57+
StringRef InFile) override;
5858
};
5959

6060
class ASTViewAction : public ASTFrontendAction {
6161
protected:
62-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
63-
StringRef InFile) override;
62+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
63+
StringRef InFile) override;
6464
};
6565

6666
class DeclContextPrintAction : public ASTFrontendAction {
6767
protected:
68-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
69-
StringRef InFile) override;
68+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
69+
StringRef InFile) override;
7070
};
7171

7272
class GeneratePCHAction : public ASTFrontendAction {
7373
protected:
74-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
75-
StringRef InFile) override;
74+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
75+
StringRef InFile) override;
7676

7777
TranslationUnitKind getTranslationUnitKind() override {
7878
return TU_Prefix;
@@ -98,8 +98,8 @@ class GenerateModuleAction : public ASTFrontendAction {
9898
bool IsSystem;
9999

100100
protected:
101-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
102-
StringRef InFile) override;
101+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
102+
StringRef InFile) override;
103103

104104
TranslationUnitKind getTranslationUnitKind() override {
105105
return TU_Module;
@@ -128,8 +128,8 @@ class GenerateModuleAction : public ASTFrontendAction {
128128

129129
class SyntaxOnlyAction : public ASTFrontendAction {
130130
protected:
131-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
132-
StringRef InFile) override;
131+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
132+
StringRef InFile) override;
133133

134134
public:
135135
bool hasCodeCompletionSupport() const override { return true; }
@@ -139,8 +139,8 @@ class SyntaxOnlyAction : public ASTFrontendAction {
139139
/// basic debugging and discovery.
140140
class DumpModuleInfoAction : public ASTFrontendAction {
141141
protected:
142-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
143-
StringRef InFile) override;
142+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
143+
StringRef InFile) override;
144144
void ExecuteAction() override;
145145

146146
public:
@@ -152,8 +152,8 @@ class DumpModuleInfoAction : public ASTFrontendAction {
152152

153153
class VerifyPCHAction : public ASTFrontendAction {
154154
protected:
155-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
156-
StringRef InFile) override;
155+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
156+
StringRef InFile) override;
157157

158158
void ExecuteAction() override;
159159

@@ -177,8 +177,8 @@ class ASTMergeAction : public FrontendAction {
177177
std::vector<std::string> ASTFiles;
178178

179179
protected:
180-
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
181-
StringRef InFile) override;
180+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
181+
StringRef InFile) override;
182182

183183
bool BeginSourceFileAction(CompilerInstance &CI,
184184
StringRef Filename) override;
@@ -200,7 +200,8 @@ class ASTMergeAction : public FrontendAction {
200200
class PrintPreambleAction : public FrontendAction {
201201
protected:
202202
void ExecuteAction() override;
203-
ASTConsumer *CreateASTConsumer(CompilerInstance &, StringRef) override {
203+
std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &,
204+
StringRef) override {
204205
return nullptr;
205206
}
206207

‎clang/include/clang/Frontend/MultiplexConsumer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MultiplexASTDeserializationListener;
2929
class MultiplexConsumer : public SemaConsumer {
3030
public:
3131
// Takes ownership of the pointers in C.
32-
MultiplexConsumer(ArrayRef<ASTConsumer*> C);
32+
MultiplexConsumer(std::vector<std::unique_ptr<ASTConsumer>> C);
3333
~MultiplexConsumer();
3434

3535
// ASTConsumer
@@ -59,7 +59,7 @@ class MultiplexConsumer : public SemaConsumer {
5959
void ForgetSema() override;
6060

6161
private:
62-
std::vector<ASTConsumer*> Consumers; // Owns these.
62+
std::vector<std::unique_ptr<ASTConsumer>> Consumers; // Owns these.
6363
std::unique_ptr<MultiplexASTMutationListener> MutationListener;
6464
std::unique_ptr<MultiplexASTDeserializationListener> DeserializationListener;
6565
};

‎clang/include/clang/Rewrite/Frontend/ASTConsumers.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#define REWRITE_ASTCONSUMERS_H
1616

1717
#include "clang/Basic/LLVM.h"
18+
19+
#include <memory>
1820
#include <string>
1921

2022
namespace clang {
@@ -26,23 +28,21 @@ class Preprocessor;
2628

2729
// ObjC rewriter: attempts to rewrite ObjC constructs into pure C code.
2830
// This is considered experimental, and only works with Apple's ObjC runtime.
29-
ASTConsumer *CreateObjCRewriter(const std::string &InFile,
30-
raw_ostream *OS,
31-
DiagnosticsEngine &Diags,
32-
const LangOptions &LOpts,
33-
bool SilenceRewriteMacroWarning);
34-
ASTConsumer *CreateModernObjCRewriter(const std::string &InFile,
35-
raw_ostream *OS,
36-
DiagnosticsEngine &Diags,
37-
const LangOptions &LOpts,
38-
bool SilenceRewriteMacroWarning,
39-
bool LineInfo);
31+
std::unique_ptr<ASTConsumer>
32+
CreateObjCRewriter(const std::string &InFile, raw_ostream *OS,
33+
DiagnosticsEngine &Diags, const LangOptions &LOpts,
34+
bool SilenceRewriteMacroWarning);
35+
std::unique_ptr<ASTConsumer>
36+
CreateModernObjCRewriter(const std::string &InFile, raw_ostream *OS,
37+
DiagnosticsEngine &Diags, const LangOptions &LOpts,
38+
bool SilenceRewriteMacroWarning, bool LineInfo);
4039

4140
/// CreateHTMLPrinter - Create an AST consumer which rewrites source code to
4241
/// HTML with syntax highlighting suitable for viewing in a web-browser.
43-
ASTConsumer *CreateHTMLPrinter(raw_ostream *OS, Preprocessor &PP,
44-
bool SyntaxHighlight = true,
45-
bool HighlightMacros = true);
42+
std::unique_ptr<ASTConsumer> CreateHTMLPrinter(raw_ostream *OS,
43+
Preprocessor &PP,
44+
bool SyntaxHighlight = true,
45+
bool HighlightMacros = true);
4646

4747
} // end clang namespace
4848

0 commit comments

Comments
 (0)