Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 467dc88

Browse files
DougGregorDougGregor
committed
Introduce a -cc1 option "-emit-module", that creates a binary module
from the given source. -emit-module behaves similarly to -emit-pch, except that Sema is somewhat more strict about the contents of -emit-module. In the future, there are likely to be more interesting differences. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138595 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent ca4c40a commit 467dc88

25 files changed

+99
-67
lines changed

‎include/clang/Basic/LangOptions.h

+12
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,18 @@ class OpenCLOptions {
296296
}
297297
};
298298

299+
/// \brief Describes the kind of translation unit being processed.
300+
enum TranslationUnitKind {
301+
/// \brief The translation unit is a complete translation unit.
302+
TU_Complete,
303+
/// \brief The translation unit is a prefix to a translation unit, and is
304+
/// not complete.
305+
TU_Prefix,
306+
/// \brief The translation unit is a module.
307+
TU_Module
308+
};
309+
310+
/// \brief
299311
} // end namespace clang
300312

301313
#endif

‎include/clang/Driver/CC1Options.td

+2
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ def ast_view : Flag<"-ast-view">,
360360
HelpText<"Build ASTs and view them with GraphViz">;
361361
def print_decl_contexts : Flag<"-print-decl-contexts">,
362362
HelpText<"Print DeclContexts and their Decls">;
363+
def emit_module : Flag<"-emit-module">,
364+
HelpText<"Generate pre-compiled module file">;
363365
def emit_pth : Flag<"-emit-pth">,
364366
HelpText<"Generate pre-tokenized header file">;
365367
def emit_pch : Flag<"-emit-pch">,

‎include/clang/Frontend/ASTUnit.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class ASTUnit {
112112
/// \brief Track whether the main file was loaded from an AST or not.
113113
bool MainFileIsAST;
114114

115-
/// \brief Whether this AST represents a complete translation unit.
116-
bool CompleteTranslationUnit;
115+
/// \brief What kind of translation unit this AST represents.
116+
TranslationUnitKind TUKind;
117117

118118
/// \brief Whether we should time each operation.
119119
bool WantTiming;
@@ -548,11 +548,8 @@ class ASTUnit {
548548
llvm::MemoryBuffer *getBufferForFile(StringRef Filename,
549549
std::string *ErrorStr = 0);
550550

551-
/// \brief Whether this AST represents a complete translation unit.
552-
///
553-
/// If false, this AST is only a partial translation unit, e.g., one
554-
/// that might still be used as a precompiled header or preamble.
555-
bool isCompleteTranslationUnit() const { return CompleteTranslationUnit; }
551+
/// \brief Determine what kind of translation unit this AST represents.
552+
TranslationUnitKind getTranslationUnitKind() const { return TUKind; }
556553

557554
typedef llvm::PointerUnion<const char *, const llvm::MemoryBuffer *>
558555
FilenameOrMemBuf;
@@ -624,7 +621,7 @@ class ASTUnit {
624621
bool OnlyLocalDecls = false,
625622
bool CaptureDiagnostics = false,
626623
bool PrecompilePreamble = false,
627-
bool CompleteTranslationUnit = true,
624+
TranslationUnitKind TUKind = TU_Complete,
628625
bool CacheCodeCompletionResults = false,
629626
bool NestedMacroExpansions = true);
630627

@@ -652,7 +649,7 @@ class ASTUnit {
652649
unsigned NumRemappedFiles = 0,
653650
bool RemappedFilesKeepOriginalName = true,
654651
bool PrecompilePreamble = false,
655-
bool CompleteTranslationUnit = true,
652+
TranslationUnitKind TUKind = TU_Complete,
656653
bool CacheCodeCompletionResults = false,
657654
bool CXXPrecompilePreamble = false,
658655
bool CXXChainedPCH = false,

‎include/clang/Frontend/CompilerInstance.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ class CompilerInstance {
548548
raw_ostream &OS);
549549

550550
/// \brief Create the Sema object to be used for parsing.
551-
void createSema(bool CompleteTranslationUnit,
551+
void createSema(TranslationUnitKind TUKind,
552552
CodeCompleteConsumer *CompletionConsumer);
553553

554554
/// Create the frontend timer and replace any existing one with it.

‎include/clang/Frontend/FrontendAction.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#define LLVM_CLANG_FRONTEND_FRONTENDACTION_H
1212

1313
#include "clang/Basic/LLVM.h"
14+
#include "clang/Basic/LangOptions.h"
1415
#include "llvm/ADT/StringRef.h"
1516
#include "llvm/ADT/OwningPtr.h"
1617
#include <string>
@@ -160,9 +161,8 @@ class FrontendAction {
160161
/// file inputs.
161162
virtual bool usesPreprocessorOnly() const = 0;
162163

163-
/// usesCompleteTranslationUnit - For AST based actions, should the
164-
/// translation unit be completed?
165-
virtual bool usesCompleteTranslationUnit() { return true; }
164+
/// \brief For AST-based actions, the kind of translation unit we're handling.
165+
virtual TranslationUnitKind getTranslationUnitKind() { return TU_Complete; }
166166

167167
/// hasPCHSupport - Does this action support use with PCH?
168168
virtual bool hasPCHSupport() const { return !usesPreprocessorOnly(); }
@@ -282,7 +282,7 @@ class WrapperFrontendAction : public FrontendAction {
282282
WrapperFrontendAction(FrontendAction *WrappedAction);
283283

284284
virtual bool usesPreprocessorOnly() const;
285-
virtual bool usesCompleteTranslationUnit();
285+
virtual TranslationUnitKind getTranslationUnitKind();
286286
virtual bool hasPCHSupport() const;
287287
virtual bool hasASTFileSupport() const;
288288
virtual bool hasIRSupport() const;

‎include/clang/Frontend/FrontendActions.h

+9-2
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,22 @@ class DeclContextPrintAction : public ASTFrontendAction {
6767
};
6868

6969
class GeneratePCHAction : public ASTFrontendAction {
70+
bool MakeModule;
71+
7072
protected:
7173
virtual ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
7274
StringRef InFile);
7375

74-
virtual bool usesCompleteTranslationUnit() { return false; }
76+
virtual TranslationUnitKind getTranslationUnitKind() {
77+
return MakeModule? TU_Module : TU_Prefix;
78+
}
7579

7680
virtual bool hasASTFileSupport() const { return false; }
7781

7882
public:
83+
/// \brief Create a new action
84+
explicit GeneratePCHAction(bool MakeModule) : MakeModule(MakeModule) { }
85+
7986
/// \brief Compute the AST consumer arguments that will be used to
8087
/// create the PCHGenerator instance returned by CreateASTConsumer.
8188
///
@@ -128,7 +135,7 @@ class ASTMergeAction : public FrontendAction {
128135
virtual ~ASTMergeAction();
129136

130137
virtual bool usesPreprocessorOnly() const;
131-
virtual bool usesCompleteTranslationUnit();
138+
virtual TranslationUnitKind getTranslationUnitKind();
132139
virtual bool hasPCHSupport() const;
133140
virtual bool hasASTFileSupport() const;
134141
virtual bool hasCodeCompletionSupport() const;

‎include/clang/Frontend/FrontendOptions.h

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ namespace frontend {
3535
EmitCodeGenOnly, ///< Generate machine code, but don't emit anything.
3636
EmitObj, ///< Emit a .o file.
3737
FixIt, ///< Parse and apply any fixits to the source.
38+
GenerateModule, ///< Generate pre-compiled module.
3839
GeneratePCH, ///< Generate pre-compiled header.
3940
GeneratePTH, ///< Generate pre-tokenized header.
4041
InitOnly, ///< Only execute frontend initialization.

‎include/clang/Parse/ParseAST.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#ifndef LLVM_CLANG_PARSE_PARSEAST_H
1515
#define LLVM_CLANG_PARSE_PARSEAST_H
1616

17+
#include "clang/Basic/LangOptions.h"
18+
1719
namespace clang {
1820
class Preprocessor;
1921
class ASTConsumer;
@@ -27,15 +29,13 @@ namespace clang {
2729
/// This operation inserts the parsed decls into the translation
2830
/// unit held by Ctx.
2931
///
30-
/// \param CompleteTranslationUnit When true, the parsed file is
31-
/// considered to be a complete translation unit, and any
32-
/// end-of-translation-unit wrapup will be performed.
32+
/// \param TUKind The kind of translation unit being parsed.
3333
///
3434
/// \param CompletionConsumer If given, an object to consume code completion
3535
/// results.
3636
void ParseAST(Preprocessor &pp, ASTConsumer *C,
3737
ASTContext &Ctx, bool PrintStats = false,
38-
bool CompleteTranslationUnit = true,
38+
TranslationUnitKind TUKind = TU_Complete,
3939
CodeCompleteConsumer *CompletionConsumer = 0);
4040

4141
/// \brief Parse the main file known to the preprocessor, producing an

‎include/clang/Sema/Sema.h

+6-8
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,14 @@ class Sema {
630630
/// for C++ records.
631631
llvm::FoldingSet<SpecialMemberOverloadResult> SpecialMemberCache;
632632

633-
/// \brief Whether the code handled by Sema should be considered a
634-
/// complete translation unit or not.
633+
/// \brief The kind of translation unit we are processing.
635634
///
636-
/// When true (which is generally the case), Sema will perform
635+
/// When we're processing a complete translation unit, Sema will perform
637636
/// end-of-translation-unit semantic tasks (such as creating
638637
/// initializers for tentative definitions in C) once parsing has
639-
/// completed. This flag will be false when building PCH files,
640-
/// since a PCH file is by definition not a complete translation
641-
/// unit.
642-
bool CompleteTranslationUnit;
638+
/// completed. Modules and precompiled headers perform different kinds of
639+
/// checks.
640+
TranslationUnitKind TUKind;
643641

644642
llvm::BumpPtrAllocator BumpAlloc;
645643

@@ -685,7 +683,7 @@ class Sema {
685683
bool isSelfExpr(Expr *RExpr);
686684
public:
687685
Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer,
688-
bool CompleteTranslationUnit = true,
686+
TranslationUnitKind TUKind = TU_Complete,
689687
CodeCompleteConsumer *CompletionConsumer = 0);
690688
~Sema();
691689

‎include/clang/Serialization/ASTWriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ class PCHGenerator : public SemaConsumer {
641641
const ASTWriter &getWriter() const { return Writer; }
642642

643643
public:
644-
PCHGenerator(const Preprocessor &PP, const std::string &OutputFile,
644+
PCHGenerator(const Preprocessor &PP, StringRef OutputFile,
645645
bool Chaining, StringRef isysroot, raw_ostream *Out);
646646
~PCHGenerator();
647647
virtual void InitializeSema(Sema &S) { SemaPtr = &S; }

‎lib/Frontend/ASTMerge.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ bool ASTMergeAction::usesPreprocessorOnly() const {
9393
return AdaptedAction->usesPreprocessorOnly();
9494
}
9595

96-
bool ASTMergeAction::usesCompleteTranslationUnit() {
97-
return AdaptedAction->usesCompleteTranslationUnit();
96+
TranslationUnitKind ASTMergeAction::getTranslationUnitKind() {
97+
return AdaptedAction->getTranslationUnitKind();
9898
}
9999

100100
bool ASTMergeAction::hasPCHSupport() const {

‎lib/Frontend/ASTUnit.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static llvm::sys::cas_flag ActiveASTUnitObjects;
9797
ASTUnit::ASTUnit(bool _MainFileIsAST)
9898
: OnlyLocalDecls(false), CaptureDiagnostics(false),
9999
MainFileIsAST(_MainFileIsAST),
100-
CompleteTranslationUnit(true), WantTiming(getenv("LIBCLANG_TIMING")),
100+
TUKind(TU_Complete), WantTiming(getenv("LIBCLANG_TIMING")),
101101
OwnsRemappedFileBuffers(true),
102102
NumStoredDiagnosticsFromDriver(0),
103103
ConcurrencyCheckValue(CheckUnlocked),
@@ -759,8 +759,8 @@ class TopLevelDeclTrackerAction : public ASTFrontendAction {
759759
TopLevelDeclTrackerAction(ASTUnit &_Unit) : Unit(_Unit) {}
760760

761761
virtual bool hasCodeCompletionSupport() const { return false; }
762-
virtual bool usesCompleteTranslationUnit() {
763-
return Unit.isCompleteTranslationUnit();
762+
virtual TranslationUnitKind getTranslationUnitKind() {
763+
return Unit.getTranslationUnitKind();
764764
}
765765
};
766766

@@ -844,7 +844,7 @@ class PrecompilePreambleAction : public ASTFrontendAction {
844844

845845
virtual bool hasCodeCompletionSupport() const { return false; }
846846
virtual bool hasASTFileSupport() const { return false; }
847-
virtual bool usesCompleteTranslationUnit() { return false; }
847+
virtual TranslationUnitKind getTranslationUnitKind() { return TU_Prefix; }
848848
};
849849

850850
}
@@ -1592,8 +1592,7 @@ ASTUnit *ASTUnit::LoadFromCompilerInvocationAction(CompilerInvocation *CI,
15921592
AST->Diagnostics = Diags;
15931593
AST->OnlyLocalDecls = false;
15941594
AST->CaptureDiagnostics = false;
1595-
AST->CompleteTranslationUnit = Action ? Action->usesCompleteTranslationUnit()
1596-
: true;
1595+
AST->TUKind = Action ? Action->getTranslationUnitKind() : TU_Complete;
15971596
AST->ShouldCacheCodeCompletionResults = false;
15981597
AST->Invocation = CI;
15991598

@@ -1727,7 +1726,7 @@ ASTUnit *ASTUnit::LoadFromCompilerInvocation(CompilerInvocation *CI,
17271726
bool OnlyLocalDecls,
17281727
bool CaptureDiagnostics,
17291728
bool PrecompilePreamble,
1730-
bool CompleteTranslationUnit,
1729+
TranslationUnitKind TUKind,
17311730
bool CacheCodeCompletionResults,
17321731
bool NestedMacroExpansions) {
17331732
// Create the AST unit.
@@ -1737,7 +1736,7 @@ ASTUnit *ASTUnit::LoadFromCompilerInvocation(CompilerInvocation *CI,
17371736
AST->Diagnostics = Diags;
17381737
AST->OnlyLocalDecls = OnlyLocalDecls;
17391738
AST->CaptureDiagnostics = CaptureDiagnostics;
1740-
AST->CompleteTranslationUnit = CompleteTranslationUnit;
1739+
AST->TUKind = TUKind;
17411740
AST->ShouldCacheCodeCompletionResults = CacheCodeCompletionResults;
17421741
AST->Invocation = CI;
17431742
AST->NestedMacroExpansions = NestedMacroExpansions;
@@ -1762,7 +1761,7 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin,
17621761
unsigned NumRemappedFiles,
17631762
bool RemappedFilesKeepOriginalName,
17641763
bool PrecompilePreamble,
1765-
bool CompleteTranslationUnit,
1764+
TranslationUnitKind TUKind,
17661765
bool CacheCodeCompletionResults,
17671766
bool CXXPrecompilePreamble,
17681767
bool CXXChainedPCH,
@@ -1828,7 +1827,7 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin,
18281827
AST->FileMgr = new FileManager(AST->FileSystemOpts);
18291828
AST->OnlyLocalDecls = OnlyLocalDecls;
18301829
AST->CaptureDiagnostics = CaptureDiagnostics;
1831-
AST->CompleteTranslationUnit = CompleteTranslationUnit;
1830+
AST->TUKind = TUKind;
18321831
AST->ShouldCacheCodeCompletionResults = CacheCodeCompletionResults;
18331832
AST->NumStoredDiagnosticsFromDriver = StoredDiagnostics.size();
18341833
AST->StoredDiagnostics.swap(StoredDiagnostics);

‎lib/Frontend/CompilerInstance.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ CompilerInstance::createCodeCompletionConsumer(Preprocessor &PP,
382382
ShowGlobals, OS);
383383
}
384384

385-
void CompilerInstance::createSema(bool CompleteTranslationUnit,
385+
void CompilerInstance::createSema(TranslationUnitKind TUKind,
386386
CodeCompleteConsumer *CompletionConsumer) {
387387
TheSema.reset(new Sema(getPreprocessor(), getASTContext(), getASTConsumer(),
388-
CompleteTranslationUnit, CompletionConsumer));
388+
TUKind, CompletionConsumer));
389389
}
390390

391391
// Output Files

‎lib/Frontend/CompilerInvocation.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ static const char *getActionName(frontend::ActionKind Kind) {
372372
case frontend::EmitCodeGenOnly: return "-emit-codegen-only";
373373
case frontend::EmitObj: return "-emit-obj";
374374
case frontend::FixIt: return "-fixit";
375+
case frontend::GenerateModule: return "-emit-module";
375376
case frontend::GeneratePCH: return "-emit-pch";
376377
case frontend::GeneratePTH: return "-emit-pth";
377378
case frontend::InitOnly: return "-init-only";
@@ -1205,6 +1206,8 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
12051206
// fall-through!
12061207
case OPT_fixit:
12071208
Opts.ProgramAction = frontend::FixIt; break;
1209+
case OPT_emit_module:
1210+
Opts.ProgramAction = frontend::GenerateModule; break;
12081211
case OPT_emit_pch:
12091212
Opts.ProgramAction = frontend::GeneratePCH; break;
12101213
case OPT_emit_pth:

‎lib/Frontend/FrontendAction.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ void ASTFrontendAction::ExecuteAction() {
398398
CompletionConsumer = &CI.getCodeCompletionConsumer();
399399

400400
if (!CI.hasSema())
401-
CI.createSema(usesCompleteTranslationUnit(), CompletionConsumer);
401+
CI.createSema(getTranslationUnitKind(), CompletionConsumer);
402402

403403
ParseAST(CI.getSema(), CI.getFrontendOpts().ShowStats);
404404
}
@@ -432,8 +432,8 @@ void WrapperFrontendAction::EndSourceFileAction() {
432432
bool WrapperFrontendAction::usesPreprocessorOnly() const {
433433
return WrappedAction->usesPreprocessorOnly();
434434
}
435-
bool WrapperFrontendAction::usesCompleteTranslationUnit() {
436-
return WrappedAction->usesCompleteTranslationUnit();
435+
TranslationUnitKind WrapperFrontendAction::getTranslationUnitKind() {
436+
return WrappedAction->getTranslationUnitKind();
437437
}
438438
bool WrapperFrontendAction::hasPCHSupport() const {
439439
return WrappedAction->hasPCHSupport();

‎lib/Frontend/FrontendActions.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ ASTConsumer *GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI,
7979
std::string OutputFile;
8080
raw_ostream *OS = 0;
8181
bool Chaining;
82-
if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS, Chaining))
82+
if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS,
83+
Chaining))
8384
return 0;
8485

8586
if (!CI.getFrontendOpts().RelocatablePCH)
8687
Sysroot.clear();
87-
return new PCHGenerator(CI.getPreprocessor(), OutputFile, Chaining, Sysroot,
88+
return new PCHGenerator(CI.getPreprocessor(), OutputFile, Chaining, Sysroot,
8889
OS);
8990
}
9091

‎lib/FrontendTool/ExecuteCompilerInvocation.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) {
5050
case EmitCodeGenOnly: return new EmitCodeGenOnlyAction();
5151
case EmitObj: return new EmitObjAction();
5252
case FixIt: return new FixItAction();
53-
case GeneratePCH: return new GeneratePCHAction();
53+
case GenerateModule: return new GeneratePCHAction(true);
54+
case GeneratePCH: return new GeneratePCHAction(false);
5455
case GeneratePTH: return new GeneratePTHAction();
5556
case InitOnly: return new InitOnlyAction();
5657
case ParseSyntaxOnly: return new SyntaxOnlyAction();

‎lib/Parse/ParseAST.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ using namespace clang;
3737
///
3838
void clang::ParseAST(Preprocessor &PP, ASTConsumer *Consumer,
3939
ASTContext &Ctx, bool PrintStats,
40-
bool CompleteTranslationUnit,
40+
TranslationUnitKind TUKind,
4141
CodeCompleteConsumer *CompletionConsumer) {
4242

4343
llvm::OwningPtr<Sema> S(new Sema(PP, Ctx, *Consumer,
44-
CompleteTranslationUnit,
44+
TUKind,
4545
CompletionConsumer));
4646

4747
// Recover resources if we crash before exiting this method.

0 commit comments

Comments
 (0)