Author: Kadir Cetinkaya Date: 2020-04-21T11:57:59+02:00 New Revision: 4ccafab0769ffaf1aee1c727ee5b733ce7907594
URL: https://github.com/llvm/llvm-project/commit/4ccafab0769ffaf1aee1c727ee5b733ce7907594 DIFF: https://github.com/llvm/llvm-project/commit/4ccafab0769ffaf1aee1c727ee5b733ce7907594.diff LOG: [clangd] Change field name to prevent shadowing Added: Modified: clang-tools-extra/clangd/CodeComplete.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp index 3fa5b53ebaad..3d9bfe509f2b 100644 --- a/clang-tools-extra/clangd/CodeComplete.cpp +++ b/clang-tools-extra/clangd/CodeComplete.cpp @@ -1023,7 +1023,7 @@ struct SemaCompleteInput { PathRef FileName; const tooling::CompileCommand &Command; const PreambleData &Preamble; - const PreamblePatch &PreamblePatch; + const PreamblePatch &Patch; llvm::StringRef Contents; size_t Offset; llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS; @@ -1096,7 +1096,7 @@ bool semaCodeComplete(std::unique_ptr<CodeCompleteConsumer> Consumer, PreambleBounds PreambleRegion = ComputePreambleBounds(*CI->getLangOpts(), ContentsBuffer.get(), 0); bool CompletingInPreamble = PreambleRegion.Size > Input.Offset; - Input.PreamblePatch.apply(*CI); + Input.Patch.apply(*CI); // NOTE: we must call BeginSourceFile after prepareCompilerInstance. Otherwise // the remapped buffers do not get freed. auto Clang = prepareCompilerInstance( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
