[llvm-branch-commits] [cfe-branch] r332113 - Merging r327322:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri May 11 11:07:34 2018
New Revision: 332113

URL: http://llvm.org/viewvc/llvm-project?rev=332113&view=rev
Log:
Merging r327322:

------------------------------------------------------------------------
r327322 | arphaman | 2018-03-12 12:36:29 -0700 (Mon, 12 Mar 2018) | 7 lines

[Tooling] Clear the PreambleSrcLocCache when preamble is discarded during reparsing

This ensures that diagnostics are not remapped to incorrect preamble locations after
the second reparse with a remapped header file occurs.

rdar://37502480

------------------------------------------------------------------------

Added:
    cfe/branches/release_60/test/Index/Inputs/reparse-issue.h
    cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-0
    cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-1
    cfe/branches/release_60/test/Index/reparsed-live-issue.cpp
Modified:
    cfe/branches/release_60/lib/Frontend/ASTUnit.cpp

Modified: cfe/branches/release_60/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/lib/Frontend/ASTUnit.cpp?rev=332113&r1=332112&r2=332113&view=diff
==============================================================================
--- cfe/branches/release_60/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/branches/release_60/lib/Frontend/ASTUnit.cpp Fri May 11 11:07:34 2018
@@ -1259,6 +1259,7 @@ ASTUnit::getMainBufferWithPrecompiledPre
       Preamble.reset();
       PreambleDiagnostics.clear();
       TopLevelDeclsInPreamble.clear();
+      PreambleSrcLocCache.clear();
       PreambleRebuildCounter = 1;
     }
   }

Added: cfe/branches/release_60/test/Index/Inputs/reparse-issue.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/test/Index/Inputs/reparse-issue.h?rev=332113&view=auto
==============================================================================
--- cfe/branches/release_60/test/Index/Inputs/reparse-issue.h (added)
+++ cfe/branches/release_60/test/Index/Inputs/reparse-issue.h Fri May 11 11:07:34 2018
@@ -0,0 +1,3 @@
+
+asdf;
+

Added: cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-0
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-0?rev=332113&view=auto
==============================================================================
--- cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-0 (added)
+++ cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-0 Fri May 11 11:07:34 2018
@@ -0,0 +1,4 @@
+//
+//
+asdf;
+

Added: cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-1
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-1?rev=332113&view=auto
==============================================================================
--- cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-1 (added)
+++ cfe/branches/release_60/test/Index/Inputs/reparse-issue.h-1 Fri May 11 11:07:34 2018
@@ -0,0 +1,5 @@
+//
+//
+//
+asdf;
+

Added: cfe/branches/release_60/test/Index/reparsed-live-issue.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/test/Index/reparsed-live-issue.cpp?rev=332113&view=auto
==============================================================================
--- cfe/branches/release_60/test/Index/reparsed-live-issue.cpp (added)
+++ cfe/branches/release_60/test/Index/reparsed-live-issue.cpp Fri May 11 11:07:34 2018
@@ -0,0 +1,4 @@
+// RUN: CINDEXTEST_EDITING=1 LIBCLANG_DISABLE_CRASH_RECOVERY=1 c-index-test -test-load-source-reparse 2 none -remap-file-0=%S/Inputs/reparse-issue.h,%S/Inputs/reparse-issue.h-0 -remap-file-1=%S/Inputs/reparse-issue.h,%S/Inputs/reparse-issue.h-1 -- %s 2>&1 | FileCheck %s
+#include "Inputs/reparse-issue.h"
+
+// CHECK: reparse-issue.h:4:1:{1:1-1:1}: error: C++ requires a type specifier for all declarations