*/
CXTranslationUnit_KeepGoing = 0x200,
- /**\r
- * Sets the preprocessor in a mode for parsing a single file only.\r
- */\r
- CXTranslationUnit_SingleFileParse = 0x400,\r
-\r
- /**\r
- * \brief Used in combination with CXTranslationUnit_SkipFunctionBodies to\r
- * constrain the skipping of function bodies to the preamble.\r
- *\r
- * The function bodies of the main file are not skipped.\r
- */\r
- CXTranslationUnit_LimitSkipFunctionBodiesToPreamble = 0x800,\r
-};\r
-\r
-/**\r
+ /**
+ * Sets the preprocessor in a mode for parsing a single file only.
+ */
+ CXTranslationUnit_SingleFileParse = 0x400
+};
+
+/**
* Returns the set of flags that is suitable for parsing a translation
* unit that is being edited.
*
namespace vfs {
class FileSystem;
-\r
-} // namespace vfs\r
-\r
-/// \brief Enumerates the available scopes for skipping function bodies.\r
-enum class SkipFunctionBodiesScope { None, Preamble, PreambleAndMainFile };\r
-\r
-/// Utility class for loading a ASTContext from an AST file.\r
-class ASTUnit {\r
-public:\r
+
+} // namespace vfs
+
+/// Utility class for loading a ASTContext from an AST file.
+class ASTUnit {
+public:
struct StandaloneFixIt {
std::pair<unsigned, unsigned> RemoveRange;
std::pair<unsigned, unsigned> InsertFromRange;
unsigned CurrentTopLevelHashValue = 0;
/// Bit used by CIndex to mark when a translation unit may be in an
- /// inconsistent state, and is not safe to free.\r
- unsigned UnsafeToFree : 1;\r
-\r
- /// \brief Enumerator specifying the scope for skipping function bodies.\r
- SkipFunctionBodiesScope SkipFunctionBodies = SkipFunctionBodiesScope::None;\r
-\r
- /// Cache any "global" code-completion results, so that we can avoid\r
- /// recomputing them with each completion.\r
- void CacheCodeCompletionResults();\r
+ /// inconsistent state, and is not safe to free.
+ unsigned UnsafeToFree : 1;
+
+ /// Cache any "global" code-completion results, so that we can avoid
+ /// recomputing them with each completion.
+ void CacheCodeCompletionResults();
/// Clear out and deallocate
void ClearCachedCompletionResults();
bool Parse(std::shared_ptr<PCHContainerOperations> PCHContainerOps,
std::unique_ptr<llvm::MemoryBuffer> OverrideMainBuffer,
IntrusiveRefCntPtr<vfs::FileSystem> VFS);
-\r
- std::unique_ptr<llvm::MemoryBuffer> getMainBufferWithPrecompiledPreamble(\r
- std::shared_ptr<PCHContainerOperations> PCHContainerOps,\r
- CompilerInvocation &PreambleInvocationIn,\r
- IntrusiveRefCntPtr<vfs::FileSystem> VFS, bool AllowRebuild = true,\r
- unsigned MaxLines = 0);\r
- void RealizeTopLevelDeclsFromPreamble();\r
+
+ std::unique_ptr<llvm::MemoryBuffer> getMainBufferWithPrecompiledPreamble(
+ std::shared_ptr<PCHContainerOperations> PCHContainerOps,
+ const CompilerInvocation &PreambleInvocationIn,
+ IntrusiveRefCntPtr<vfs::FileSystem> VFS, bool AllowRebuild = true,
+ unsigned MaxLines = 0);
+ void RealizeTopLevelDeclsFromPreamble();
/// Transfers ownership of the objects (like SourceManager) from
/// \param CI to this ASTUnit.
ArrayRef<RemappedFile> RemappedFiles = None,
bool RemappedFilesKeepOriginalName = true,
unsigned PrecompilePreambleAfterNParses = 0,
- TranslationUnitKind TUKind = TU_Complete,\r
- bool CacheCodeCompletionResults = false,\r
- bool IncludeBriefCommentsInCodeCompletion = false,\r
- bool AllowPCHWithCompilerErrors = false,\r
- SkipFunctionBodiesScope SkipFunctionBodies =\r
- SkipFunctionBodiesScope::None,\r
- bool SingleFileParse = false, bool UserFilesAreVolatile = false,\r
- bool ForSerialization = false,\r
- llvm::Optional<StringRef> ModuleFormat = llvm::None,\r
- std::unique_ptr<ASTUnit> *ErrAST = nullptr,\r
- IntrusiveRefCntPtr<vfs::FileSystem> VFS = nullptr);\r
+ TranslationUnitKind TUKind = TU_Complete,
+ bool CacheCodeCompletionResults = false,
+ bool IncludeBriefCommentsInCodeCompletion = false,
+ bool AllowPCHWithCompilerErrors = false, bool SkipFunctionBodies = false,
+ bool SingleFileParse = false,
+ bool UserFilesAreVolatile = false, bool ForSerialization = false,
+ llvm::Optional<StringRef> ModuleFormat = llvm::None,
+ std::unique_ptr<ASTUnit> *ErrAST = nullptr,
+ IntrusiveRefCntPtr<vfs::FileSystem> VFS = nullptr);
/// Reparse the source files using the same command-line options that
/// were originally used to produce this translation unit.
/// \returns If the precompiled preamble can be used, returns a newly-allocated
/// buffer that should be used in place of the main file when doing so.
/// Otherwise, returns a NULL pointer.
-std::unique_ptr<llvm::MemoryBuffer>\r
-ASTUnit::getMainBufferWithPrecompiledPreamble(\r
- std::shared_ptr<PCHContainerOperations> PCHContainerOps,\r
- CompilerInvocation &PreambleInvocationIn,\r
- IntrusiveRefCntPtr<vfs::FileSystem> VFS, bool AllowRebuild,\r
- unsigned MaxLines) {\r
- auto MainFilePath =\r
+std::unique_ptr<llvm::MemoryBuffer>
+ASTUnit::getMainBufferWithPrecompiledPreamble(
+ std::shared_ptr<PCHContainerOperations> PCHContainerOps,
+ const CompilerInvocation &PreambleInvocationIn,
+ IntrusiveRefCntPtr<vfs::FileSystem> VFS, bool AllowRebuild,
+ unsigned MaxLines) {
+ auto MainFilePath =
PreambleInvocationIn.getFrontendOpts().Inputs[0].getFile();
std::unique_ptr<llvm::MemoryBuffer> MainFileBuffer =
getBufferForFileHandlingRemapping(PreambleInvocationIn, VFS.get(),
&NewPreambleDiagsStandalone);
// We did not previously compute a preamble, or it can't be reused anyway.
- SimpleTimer PreambleTimer(WantTiming);\r
- PreambleTimer.setOutput("Precompiling preamble");\r
-\r
- const bool PreviousSkipFunctionBodies =\r
- PreambleInvocationIn.getFrontendOpts().SkipFunctionBodies;\r
- if (SkipFunctionBodies == SkipFunctionBodiesScope::Preamble)\r
- PreambleInvocationIn.getFrontendOpts().SkipFunctionBodies = true;\r
-\r
- llvm::ErrorOr<PrecompiledPreamble> NewPreamble = PrecompiledPreamble::Build(\r
- PreambleInvocationIn, MainFileBuffer.get(), Bounds, *Diagnostics, VFS,\r
- PCHContainerOps, /*StoreInMemory=*/false, Callbacks);\r
-\r
- PreambleInvocationIn.getFrontendOpts().SkipFunctionBodies =\r
- PreviousSkipFunctionBodies;\r
-\r
- if (NewPreamble) {\r
- Preamble = std::move(*NewPreamble);\r
- PreambleRebuildCounter = 1;\r
+ SimpleTimer PreambleTimer(WantTiming);
+ PreambleTimer.setOutput("Precompiling preamble");
+
+ llvm::ErrorOr<PrecompiledPreamble> NewPreamble = PrecompiledPreamble::Build(
+ PreambleInvocationIn, MainFileBuffer.get(), Bounds, *Diagnostics, VFS,
+ PCHContainerOps, /*StoreInMemory=*/false, Callbacks);
+ if (NewPreamble) {
+ Preamble = std::move(*NewPreamble);
+ PreambleRebuildCounter = 1;
} else {
switch (static_cast<BuildPreambleError>(NewPreamble.getError().value())) {
case BuildPreambleError::CouldntCreateTempFile:
std::shared_ptr<PCHContainerOperations> PCHContainerOps,
IntrusiveRefCntPtr<DiagnosticsEngine> Diags, StringRef ResourceFilesPath,
bool OnlyLocalDecls, bool CaptureDiagnostics,
- ArrayRef<RemappedFile> RemappedFiles, bool RemappedFilesKeepOriginalName,\r
- unsigned PrecompilePreambleAfterNParses, TranslationUnitKind TUKind,\r
- bool CacheCodeCompletionResults, bool IncludeBriefCommentsInCodeCompletion,\r
- bool AllowPCHWithCompilerErrors, SkipFunctionBodiesScope SkipFunctionBodies,\r
- bool SingleFileParse, bool UserFilesAreVolatile, bool ForSerialization,\r
- llvm::Optional<StringRef> ModuleFormat, std::unique_ptr<ASTUnit> *ErrAST,\r
- IntrusiveRefCntPtr<vfs::FileSystem> VFS) {\r
+ ArrayRef<RemappedFile> RemappedFiles, bool RemappedFilesKeepOriginalName,
+ unsigned PrecompilePreambleAfterNParses, TranslationUnitKind TUKind,
+ bool CacheCodeCompletionResults, bool IncludeBriefCommentsInCodeCompletion,
+ bool AllowPCHWithCompilerErrors, bool SkipFunctionBodies,
+ bool SingleFileParse, bool UserFilesAreVolatile, bool ForSerialization,
+ llvm::Optional<StringRef> ModuleFormat, std::unique_ptr<ASTUnit> *ErrAST,
+ IntrusiveRefCntPtr<vfs::FileSystem> VFS) {
assert(Diags.get() && "no DiagnosticsEngine was provided");
SmallVector<StoredDiagnostic, 4> StoredDiagnostics;
PPOpts.AllowPCHWithCompilerErrors = AllowPCHWithCompilerErrors;
PPOpts.SingleFileParseMode = SingleFileParse;
- // Override the resources path.\r
- CI->getHeaderSearchOpts().ResourceDir = ResourceFilesPath;\r
-\r
- CI->getFrontendOpts().SkipFunctionBodies =\r
- SkipFunctionBodies == SkipFunctionBodiesScope::PreambleAndMainFile;\r
-\r
- if (ModuleFormat)\r
- CI->getHeaderSearchOpts().ModuleFormat = ModuleFormat.getValue();\r
+ // Override the resources path.
+ CI->getHeaderSearchOpts().ResourceDir = ResourceFilesPath;
+
+ CI->getFrontendOpts().SkipFunctionBodies = SkipFunctionBodies;
+
+ if (ModuleFormat)
+ CI->getHeaderSearchOpts().ModuleFormat = ModuleFormat.getValue();
// Create the AST unit.
std::unique_ptr<ASTUnit> AST;
AST->TUKind = TUKind;
AST->ShouldCacheCodeCompletionResults = CacheCodeCompletionResults;
AST->IncludeBriefCommentsInCodeCompletion
- = IncludeBriefCommentsInCodeCompletion;\r
- AST->UserFilesAreVolatile = UserFilesAreVolatile;\r
- AST->Invocation = CI;\r
- AST->SkipFunctionBodies = SkipFunctionBodies;\r
- if (ForSerialization)\r
- AST->WriterData.reset(new ASTWriterData(*AST->PCMCache));\r
- // Zero out now to ease cleanup during crash recovery.\r
+ = IncludeBriefCommentsInCodeCompletion;
+ AST->UserFilesAreVolatile = UserFilesAreVolatile;
+ AST->Invocation = CI;
+ if (ForSerialization)
+ AST->WriterData.reset(new ASTWriterData(*AST->PCMCache));
+ // Zero out now to ease cleanup during crash recovery.
CI = nullptr;
Diags = nullptr;
return nullptr;
// If there are no registered plugins we don't need to wrap the consumer
- if (FrontendPluginRegistry::begin() == FrontendPluginRegistry::end())\r
- return Consumer;\r
-\r
- // If this is a code completion run, avoid invoking the plugin consumers\r
- if (CI.hasCodeCompletionConsumer())\r
- return Consumer;\r
-\r
- // Collect the list of plugins that go before the main action (in Consumers)\r
- // or after it (in AfterConsumers)\r
- std::vector<std::unique_ptr<ASTConsumer>> Consumers;\r
+ if (FrontendPluginRegistry::begin() == FrontendPluginRegistry::end())
+ return Consumer;
+
+ // Collect the list of plugins that go before the main action (in Consumers)
+ // or after it (in AfterConsumers)
+ std::vector<std::unique_ptr<ASTConsumer>> Consumers;
std::vector<std::unique_ptr<ASTConsumer>> AfterConsumers;
for (FrontendPluginRegistry::iterator it = FrontendPluginRegistry::begin(),
ie = FrontendPluginRegistry::end();
+++ /dev/null
-// RUN: c-index-test -code-completion-at=%s:7:1 -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-fns %s | FileCheck %s\r
-// REQUIRES: plugins, examples\r
-// CHECK: macro definition:{{.*}}\r
-// CHECK-NOT: top-level-decl: "x"\r
-\r
-void x();\r
+++ /dev/null
-int header1(int t) {\r
- return t;\r
-}\r
-#include "skip-function-bodies.h"\r
-\r
-class A {\r
- class B {};\r
+// RUN: env CINDEXTEST_SKIP_FUNCTION_BODIES=1 c-index-test -test-load-source all %s | FileCheck %s
+
+class A {
+ class B {};
public:
A() {
@end
void J() {
- class K {};\r
-}\r
-\r
-// RUN: env CINDEXTEST_SKIP_FUNCTION_BODIES=1 c-index-test -test-load-source all %s | FileCheck %s\r
-// CHECK: skip-function-bodies.mm:3:7: ClassDecl=A:3:7 (Definition) Extent=[3:1 - 14:2]\r
-// CHECK: skip-function-bodies.mm:4:9: ClassDecl=B:4:9 (Definition) Extent=[4:3 - 4:13]\r
-// CHECK: skip-function-bodies.mm:6:1: CXXAccessSpecifier=:6:1 (Definition) Extent=[6:1 - 6:8]\r
+ class K {};
+}
+
+// CHECK: skip-function-bodies.mm:3:7: ClassDecl=A:3:7 (Definition) Extent=[3:1 - 14:2]
+// CHECK: skip-function-bodies.mm:4:9: ClassDecl=B:4:9 (Definition) Extent=[4:3 - 4:13]
+// CHECK: skip-function-bodies.mm:6:1: CXXAccessSpecifier=:6:1 (Definition) Extent=[6:1 - 6:8]
// CHECK: skip-function-bodies.mm:7:3: CXXConstructor=A:7:3 (default constructor) Extent=[7:3 - 7:6]
// CHECK-NOT: skip-function-bodies.mm:8:12: StructDecl=C:8:12 (Definition) Extent=[8:5 - 10:6]
// CHECK-NOT: skip-function-bodies.mm:9:12: CXXMethod=d:9:12 (Definition) Extent=[9:7 - 9:18]
// CHECK: skip-function-bodies.mm:19:17: ObjCImplementationDecl=F:19:17 (Definition) Extent=[19:1 - 24:2]
// CHECK: skip-function-bodies.mm:20:10: ObjCInstanceMethodDecl=G:20:10 Extent=[20:1 - 20:13]
// CHECK-NOT: skip-function-bodies.mm:21:13: TypedefDecl=H:21:13 (Definition) Extent=[21:3 - 21:14]
-// CHECK-NOT: skip-function-bodies.mm:21:11: TypeRef=class A:3:7 Extent=[21:11 - 21:12]\r
-// CHECK: skip-function-bodies.mm:26:6: FunctionDecl=J:26:6 Extent=[26:1 - 26:9]\r
-// CHECK-NOT: skip-function-bodies.mm:27:9: ClassDecl=K:27:9 (Definition) Extent=[27:3 - 27:13]\r
-\r
-// RUN: env CINDEXTEST_EDITING=1 \\r
-// RUN: CINDEXTEST_CREATE_PREAMBLE_ON_FIRST_PARSE=1 \\r
-// RUN: CINDEXTEST_SKIP_FUNCTION_BODIES=1 \\r
-// RUN: CINDEXTEST_LIMIT_SKIP_FUNCTION_BODIES_TO_PREAMBLE=1 \\r
-// RUN: c-index-test -test-load-source all %s | FileCheck -check-prefix=CHECK-PREAMBLE %s\r
-// CHECK-PREAMBLE: skip-function-bodies.h:1:5: FunctionDecl=header1:1:5 Extent=[1:1 - 1:19]\r
-// CHECK-PREAMBLE-NOT: skip-function-bodies.h:2:3: ReturnStmt= Extent=[2:3 - 2:11]\r
-// CHECK-PREAMBLE: skip-function-bodies.mm:8:12: StructDecl=C:8:12 (Definition) Extent=[8:5 - 10:6]\r
-// CHECK-PREAMBLE: skip-function-bodies.mm:9:12: CXXMethod=d:9:12 (Definition) Extent=[9:7 - 9:18]\r
+// CHECK-NOT: skip-function-bodies.mm:21:11: TypeRef=class A:3:7 Extent=[21:11 - 21:12]
+// CHECK: skip-function-bodies.mm:26:6: FunctionDecl=J:26:6 Extent=[26:1 - 26:9]
+// CHECK-NOT: skip-function-bodies.mm:27:9: ClassDecl=K:27:9 (Definition) Extent=[27:3 - 27:13]
if (getenv("CINDEXTEST_COMPLETION_BRIEF_COMMENTS"))
options |= CXTranslationUnit_IncludeBriefCommentsInCodeCompletion;
if (getenv("CINDEXTEST_CREATE_PREAMBLE_ON_FIRST_PARSE"))
- options |= CXTranslationUnit_CreatePreambleOnFirstParse;\r
- if (getenv("CINDEXTEST_KEEP_GOING"))\r
- options |= CXTranslationUnit_KeepGoing;\r
- if (getenv("CINDEXTEST_LIMIT_SKIP_FUNCTION_BODIES_TO_PREAMBLE"))\r
- options |= CXTranslationUnit_LimitSkipFunctionBodiesToPreamble;\r
-\r
- return options;\r
-}\r
+ options |= CXTranslationUnit_CreatePreambleOnFirstParse;
+ if (getenv("CINDEXTEST_KEEP_GOING"))
+ options |= CXTranslationUnit_KeepGoing;
+
+ return options;
+}
static void ModifyPrintingPolicyAccordingToEnv(CXPrintingPolicy Policy) {
struct Mapping {
= (options & (CXTranslationUnit_Incomplete |
CXTranslationUnit_SingleFileParse))? TU_Prefix : TU_Complete;
bool CacheCodeCompletionResults
- = options & CXTranslationUnit_CacheCompletionResults;\r
- bool IncludeBriefCommentsInCodeCompletion\r
- = options & CXTranslationUnit_IncludeBriefCommentsInCodeCompletion;\r
- bool SingleFileParse = options & CXTranslationUnit_SingleFileParse;\r
- bool ForSerialization = options & CXTranslationUnit_ForSerialization;\r
- SkipFunctionBodiesScope SkipFunctionBodies = SkipFunctionBodiesScope::None;\r
- if (options & CXTranslationUnit_SkipFunctionBodies) {\r
- SkipFunctionBodies =\r
- (options & CXTranslationUnit_LimitSkipFunctionBodiesToPreamble)\r
- ? SkipFunctionBodiesScope::Preamble\r
- : SkipFunctionBodiesScope::PreambleAndMainFile;\r
- }\r
-\r
- // Configure the diagnostics.\r
- IntrusiveRefCntPtr<DiagnosticsEngine>\r
+ = options & CXTranslationUnit_CacheCompletionResults;
+ bool IncludeBriefCommentsInCodeCompletion
+ = options & CXTranslationUnit_IncludeBriefCommentsInCodeCompletion;
+ bool SkipFunctionBodies = options & CXTranslationUnit_SkipFunctionBodies;
+ bool SingleFileParse = options & CXTranslationUnit_SingleFileParse;
+ bool ForSerialization = options & CXTranslationUnit_ForSerialization;
+
+ // Configure the diagnostics.
+ IntrusiveRefCntPtr<DiagnosticsEngine>
Diags(CompilerInstance::createDiagnostics(new DiagnosticOptions));
if (options & CXTranslationUnit_KeepGoing)
projects / clang / commitdiff