[clang-scan-deps] Minimizer: Correctly skip over double slashes in angle bracket #include

[aganea]

Summary

Previously, double slashes (//) occurring in angle brackets #include were incorrectly interpreted as comments. eg. #include <dir//file.h>

[arphaman]

Thanks!

lib/Lex/DependencyDirectivesSourceMinimizer.cpp

for (;;) {
     if (*Last != '"')
       continue;
     First = Last + 1;
     return;
   }
 }
 
 static void skipString(const char *&First, const char *const End) {
-  assert(*First == '\'' || *First == '"');
-  const char Terminator = *First;
+  assert(*First == '\'' || *First == '"' || *First == '<');
+  const char Terminator = *First == '<' ? '>' : *First;
   for (++First; First != End && *First != Terminator; ++First)
     if (*First == '\\')
       if (++First == End)
         return;
   if (First != End)
     ++First; // Finish off the string.
 }
 
else
     skipLine(First, End);
 }
 
 void Minimizer::printToNewline(const char *&First, const char *const End) {
   while (First != End && !isVerticalWhitespace(*First)) {
     const char *Last = First;
     do {
       // Iterate over strings correctly to avoid comments and newlines.
-      if (*Last == '"' || *Last == '\'') {
+      if (*Last == '"' || *Last == '\'' ||
+          (*Last == '<' && top() == pp_include)) {
         if (LLVM_UNLIKELY(isRawStringLiteral(First, Last)))
           skipRawString(Last, End);
         else
           skipString(Last, End);
         continue;
       }
       if (*Last != '/' || End - Last < 2) {
         ++Last;

test/Lexer/minimize_source_to_dependency_directives_include.c

+// Test double slashes in #include directive along with angle brackets. Previously, this was interpreted as comments.
+// RUN: %clang_cc1 -DTEST -print-dependency-directives-minimized-source %s 2>&1 | FileCheck %s
+
+#include "a//b.h"
+#include <a//b.h>
+
+// CHECK: #include "a//b.h"
+// CHECK: #include <a//b.h>