commit 176edba5311f6eff0cad2631449885ddf4fbc9ea
author Stephen Hines <srhines@google.com> Mon Dec 01 14:53:08 2014 -0800
committer Stephen Hines <srhines@google.com> Mon Dec 01 14:53:08 2014 -0800
tree f45baf023a7673970fc373bcdd0de5dc919905a1
parent 8b939a0498b8d24f4a5d7c6e6ac94ddba75ee933

Update aosp/master Clang for rebase to r222490.

Change-Id: Ic557ac55e97fbf6ee08771c7b7c3594777b0aefd

lib/Basic/VersionTuple.cpp

diff --git a/lib/Basic/VersionTuple.cpp b/lib/Basic/VersionTuple.cpp
index 8b781ab..aa43ae2 100644
--- a/lib/Basic/VersionTuple.cpp
+++ b/lib/Basic/VersionTuple.cpp
@@ -29,9 +29,9 @@
                                      const VersionTuple &V) {
   Out << V.getMajor();
   if (Optional<unsigned> Minor = V.getMinor())
-    Out << '.' << *Minor;
+    Out << (V.usesUnderscores() ? '_' : '.') << *Minor;
   if (Optional<unsigned> Subminor = V.getSubminor())
-    Out << '.' << *Subminor;
+    Out << (V.usesUnderscores() ? '_' : '.') << *Subminor;
   return Out;
 }