From 99ba11f395fafcc2fd32b623cdc556115b08a693 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Tue, 5 Dec 2017 02:30:43 +0000 Subject: [PATCH] [libclang] Store unsaved file hashes when recording parsing invocations Storing the contents of unsaved files is too expensive. Instead a hash is stored with a record invocation. When a reproducer is generated, Clang will compare the stored hashes to the new hashes to determine if the contents of a file has changed. This way we'll know when a reproducer was generated for a different source to the one that triggered the original crash. rdar://35322543 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@319729 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Inputs/record-parsing-invocation-remap.c | 2 ++ test/Index/record-parsing-invocation.c | 7 ++++++ tools/libclang/CIndex.cpp | 3 +-- tools/libclang/CIndexer.cpp | 22 ++++++++++++++++++- tools/libclang/CIndexer.h | 3 ++- 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 test/Index/Inputs/record-parsing-invocation-remap.c diff --git a/test/Index/Inputs/record-parsing-invocation-remap.c b/test/Index/Inputs/record-parsing-invocation-remap.c new file mode 100644 index 0000000000..4a32ca66ef --- /dev/null +++ b/test/Index/Inputs/record-parsing-invocation-remap.c @@ -0,0 +1,2 @@ + +#pragma clang __debug parser_crash diff --git a/test/Index/record-parsing-invocation.c b/test/Index/record-parsing-invocation.c index 3daa71c028..31883a9373 100644 --- a/test/Index/record-parsing-invocation.c +++ b/test/Index/record-parsing-invocation.c @@ -14,8 +14,15 @@ // RUN: env CINDEXTEST_INVOCATION_EMISSION_PATH=%t c-index-test -test-load-source all %s -DAVOID_CRASH // RUN: ls %t | count 0 +// Make sure we record the unsaved file hash. +// RUN: rm -rf %t +// RUN: mkdir %t +// RUN: not env CINDEXTEST_INVOCATION_EMISSION_PATH=%t c-index-test -test-load-source all "-remap-file=%s,%S/Inputs/record-parsing-invocation-remap.c" %s +// RUN: cat %t/libclang-* | FileCheck --check-prefix=CHECK-UNSAVED %s + #ifndef AVOID_CRASH # pragma clang __debug parser_crash #endif // CHECK: {"toolchain":"{{.*}}","libclang.operation":"parse","libclang.opts":1,"args":["clang","-fno-spell-checking","{{.*}}record-parsing-invocation.c","-Xclang","-detailed-preprocessing-record","-fallow-editor-placeholders"]} +// CHECK-UNSAVED: {"toolchain":"{{.*}}","libclang.operation":"parse","libclang.opts":1,"args":["clang","-fno-spell-checking","{{.*}}record-parsing-invocation.c","-Xclang","-detailed-preprocessing-record","-fallow-editor-placeholders"],"unsaved_file_hashes":[{"name":"{{.*}}record-parsing-invocation.c","md5":"aee23773de90e665992b48209351d70e"}]} diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index b642014c43..b2edd42cb0 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -3438,10 +3438,9 @@ clang_parseTranslationUnit_Impl(CXIndex CIdx, const char *source_filename, unsigned PrecompilePreambleAfterNParses = !PrecompilePreamble ? 0 : 2 - CreatePreambleOnFirstParse; - // FIXME: Record the hash of the unsaved files. LibclangInvocationReporter InvocationReporter( *CXXIdx, LibclangInvocationReporter::OperationKind::ParseOperation, - options, llvm::makeArrayRef(*Args)); + options, llvm::makeArrayRef(*Args), unsaved_files); std::unique_ptr Unit(ASTUnit::LoadFromCommandLine( Args->data(), Args->data() + Args->size(), CXXIdx->getPCHContainerOperations(), Diags, diff --git a/tools/libclang/CIndexer.cpp b/tools/libclang/CIndexer.cpp index 13774bd8b7..b705016251 100644 --- a/tools/libclang/CIndexer.cpp +++ b/tools/libclang/CIndexer.cpp @@ -12,11 +12,13 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" +#include "CXString.h" #include "clang/Basic/LLVM.h" #include "clang/Basic/Version.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/Config/llvm-config.h" +#include "llvm/Support/MD5.h" #include "llvm/Support/MutexGuard.h" #include "llvm/Support/Path.h" #include "llvm/Support/Program.h" @@ -90,7 +92,8 @@ StringRef CIndexer::getClangToolchainPath() { LibclangInvocationReporter::LibclangInvocationReporter( CIndexer &Idx, OperationKind Op, unsigned ParseOptions, - llvm::ArrayRef Args) { + llvm::ArrayRef Args, + llvm::ArrayRef UnsavedFiles) { StringRef Path = Idx.getInvocationEmissionPath(); if (Path.empty()) return; @@ -124,6 +127,23 @@ LibclangInvocationReporter::LibclangInvocationReporter( OS << ','; OS << '"' << I.value() << '"'; } + if (!UnsavedFiles.empty()) { + OS << R"(],"unsaved_file_hashes":[)"; + for (const auto &UF : llvm::enumerate(UnsavedFiles)) { + if (UF.index()) + OS << ','; + OS << '{'; + WriteStringKey("name", UF.value().Filename); + OS << ','; + llvm::MD5 Hash; + Hash.update(getContents(UF.value())); + llvm::MD5::MD5Result Result; + Hash.final(Result); + SmallString<32> Digest = Result.digest(); + WriteStringKey("md5", Digest); + OS << '}'; + } + } OS << "]}"; } diff --git a/tools/libclang/CIndexer.h b/tools/libclang/CIndexer.h index b3346cd955..dafbb08cfa 100644 --- a/tools/libclang/CIndexer.h +++ b/tools/libclang/CIndexer.h @@ -94,7 +94,8 @@ public: LibclangInvocationReporter(CIndexer &Idx, OperationKind Op, unsigned ParseOptions, - llvm::ArrayRef Args); + llvm::ArrayRef Args, + llvm::ArrayRef UnsavedFiles); ~LibclangInvocationReporter(); private: -- 2.40.0