r178540 - Escape # and $ in dependency files.

[Benjamin Kramer]

Author: d0k
Date: Tue Apr  2 08:38:48 2013
New Revision: 178540

URL: http://llvm.org/viewvc/llvm-project?rev=178540&view=rev
Log:
Escape # and $ in dependency files.

Fixes PR15642.

Added:
    cfe/trunk/test/Frontend/dependency-gen-escaping.c
Modified:
    cfe/trunk/lib/Frontend/DependencyFile.cpp

Modified: cfe/trunk/lib/Frontend/DependencyFile.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/DependencyFile.cpp?rev=178540&r1=178539&r2=178540&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/DependencyFile.cpp (original)
+++ cfe/trunk/lib/Frontend/DependencyFile.cpp Tue Apr  2 08:38:48 2013
@@ -151,12 +151,14 @@ void DependencyFileCallback::AddFilename
     Files.push_back(Filename);
 }
 
-/// PrintFilename - GCC escapes spaces, but apparently not ' or " or other
-/// scary characters.
+/// PrintFilename - GCC escapes spaces, # and $, but apparently not ' or " or
+/// other scary characters.
 static void PrintFilename(raw_ostream &OS, StringRef Filename) {
   for (unsigned i = 0, e = Filename.size(); i != e; ++i) {
-    if (Filename[i] == ' ')
+    if (Filename[i] == ' ' || Filename[i] == '#')
       OS << '\\';
+    else if (Filename[i] == '$') // $ is escaped by $$.
+      OS << '$';
     OS << Filename[i];
   }
 }

Added: cfe/trunk/test/Frontend/dependency-gen-escaping.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/dependency-gen-escaping.c?rev=178540&view=auto
==============================================================================
--- cfe/trunk/test/Frontend/dependency-gen-escaping.c (added)
+++ cfe/trunk/test/Frontend/dependency-gen-escaping.c Tue Apr  2 08:38:48 2013
@@ -0,0 +1,17 @@
+// REQUIRES: shell
+// PR15642
+// RUN: rm -rf %t.dir
+// RUN: mkdir -p %t.dir
+// RUN: echo > '%t.dir/    .h'
+// RUN: echo > '%t.dir/$$.h'
+// RUN: echo > '%t.dir/##.h'
+// RUN: cd %t.dir
+// RUN: %clang -MD -MF - %s -fsyntax-only -I. | FileCheck -strict-whitespace %s
+
+// CHECK: \ \ \ \ .h
+// CHECK: $$$$.h
+// CHECK: \#\#.h
+
+#include "    .h"
+#include "$$.h"
+#include "##.h"