[all-commits] [llvm/llvm-project] a0f13b: Revert "[clangd] Copy existing includes in ReplayP...

[kadir çetinkaya via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: a0f13b33742372bf00640eb18a2f3229176fc77d
      https://github.com/llvm/llvm-project/commit/a0f13b33742372bf00640eb18a2f3229176fc77d
  Author: Kadir Cetinkaya <kadircet at google.com>
  Date:   2020-06-02 (Tue, 02 Jun 2020)

  Changed paths:
    M clang-tools-extra/clangd/ParsedAST.cpp
    M clang-tools-extra/clangd/unittests/ParsedASTTests.cpp

  Log Message:
  -----------
  Revert "[clangd] Copy existing includes in ReplayPreamble"

This reverts commit bff0c56ff92106afad22b54a90e1c612da4d6f99. I've
pushed the earlier version of the patch by mistake.


  Commit: 8506877c87aa602736aee1fffbd80b886fa40b79
      https://github.com/llvm/llvm-project/commit/8506877c87aa602736aee1fffbd80b886fa40b79
  Author: Kadir Cetinkaya <kadircet at google.com>
  Date:   2020-06-02 (Tue, 02 Jun 2020)

  Changed paths:
    M clang-tools-extra/clangd/ParsedAST.cpp
    M clang-tools-extra/clangd/unittests/ParsedASTTests.cpp

  Log Message:
  -----------
  [clangd] Copy existing includes in ReplayPreamble

Summary:
ReplayPreamble was just grabbing the reference of IncludeStructure
passed to it and then replayed any includes seen so while exiting
built-in file.

This implies any include seen in built-in files being replayed as part
of preamble, even though they are not. This wasn't an issue until we've
started patching preambles, as includes from built-in files were not
mapped back to main-file.

This patch copies over existing includes at the time of
ReplayPreamble::attach and only replies those to prevent any includes
from the preamble patch getting mixed-in.

Reviewers: sammccall, jkorous

Subscribers: ilya-biryukov, MaskRay, dexonsmith, arphaman, usaxena95, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D80988


Compare: https://github.com/llvm/llvm-project/compare/dd3ebe223e81...8506877c87aa