Commit 57f962df authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r292032: 

------------------------------------------------------------------------
r292032 | yrnkrn | 2017-01-14 13:12:08 -0800 (Sat, 14 Jan 2017) | 4 lines

Fix PR31644 introduced by r287138 and add a regression test.
Thanks Dimitry Andric for the report and fix!


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

llvm-svn: 292311
parent 4fae7917

clang/lib/Frontend/DependencyFile.cpp

+2 −2
Original line number Diff line number Diff line
@@ -447,9 +447,9 @@ void DFGImpl::OutputDependencyFile() { 
  // Create phony targets if requested.

  if (PhonyTarget && !Files.empty()) {

    // Skip the first entry, this is always the input file itself.

    for (StringRef File : Files) {

    for (auto I = Files.begin() + 1, E = Files.end(); I != E; ++I) {

      OS << '\n';

      PrintFilename(OS, File, OutputFormat);

      PrintFilename(OS, *I, OutputFormat);

      OS << ":\n";

    }

  }

clang/test/Preprocessor/dependencies-and-pp.c

+7 −0
Original line number Diff line number Diff line
@@ -32,5 +32,12 @@ 
// RUN: FileCheck -check-prefix=TEST5 %s < %t.d

// TEST5: foo $$(bar) b az qu\ ux \ space:



// Test self dependency, PR31644



// RUN: %clang -E -MD -MP -MF %t.d %s

// RUN: FileCheck -check-prefix=TEST6 %s < %t.d

// TEST6: dependencies-and-pp.c

// TEST6-NOT: dependencies-and-pp.c:



// TODO: Test default target without quoting

// TODO: Test default target with quoting