summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Langmuir <blangmuir@apple.com>2014-05-16 01:38:59 +0000
committerBen Langmuir <blangmuir@apple.com>2014-05-16 01:38:59 +0000
commit5bf828dd34ab8c2c2c0df398c03dfe4f85525a9f (patch)
tree2f7d4e8d7db5861ad7c92ee20a3daf414eb9225f
parent084398857a76bce3c03381438ba545e3c4aa412f (diff)
downloadbcm5719-llvm-5bf828dd34ab8c2c2c0df398c03dfe4f85525a9f.tar.gz
bcm5719-llvm-5bf828dd34ab8c2c2c0df398c03dfe4f85525a9f.zip
Switch another write_escaped to yaml::escape
I missed one in r206443. llvm-svn: 208941
-rw-r--r--clang/tools/libclang/BuildSystem.cpp4
-rw-r--r--clang/unittests/libclang/LibclangTest.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/tools/libclang/BuildSystem.cpp b/clang/tools/libclang/BuildSystem.cpp
index c9d3c553273..e5caa5447ba 100644
--- a/clang/tools/libclang/BuildSystem.cpp
+++ b/clang/tools/libclang/BuildSystem.cpp
@@ -115,10 +115,10 @@ private:
OS.indent(Indent) << "{\n";
Indent += 2;
OS.indent(Indent) << "'type': 'directory',\n";
- OS.indent(Indent) << "'name': \"";
StringRef DirName = containedPart(ParentPath,
path::parent_path(Entry.VPath));
- OS.write_escaped(DirName) << "\",\n";
+ OS.indent(Indent)
+ << "'name': \"" << llvm::yaml::escape(DirName) << "\",\n";
OS.indent(Indent) << "'contents': [\n";
Entries = printContents(Entries, Indent + 2);
OS.indent(Indent) << "]\n";
diff --git a/clang/unittests/libclang/LibclangTest.cpp b/clang/unittests/libclang/LibclangTest.cpp
index addffe5036f..50d4c489f23 100644
--- a/clang/unittests/libclang/LibclangTest.cpp
+++ b/clang/unittests/libclang/LibclangTest.cpp
@@ -91,7 +91,7 @@ TEST(libclang, VirtualFileOverlay) {
" 'roots': [\n"
" {\n"
" 'type': 'directory',\n"
- " 'name': \"/path/virtual\",\n"
+ " 'name': \"/path/\\u266B\",\n"
" 'contents': [\n"
" {\n"
" 'type': 'file',\n"
@@ -103,7 +103,7 @@ TEST(libclang, VirtualFileOverlay) {
" ]\n"
"}\n";
TestVFO T(contents);
- T.map("/path/virtual/☂.h", "/real/☂.h");
+ T.map("/path/♫/☂.h", "/real/☂.h");
}
{
TestVFO T(NULL);
OpenPOWER on IntegriCloud