Backporting some changes from master to release_35 branch .

[neerajbadlani]

Summary

During release_35 build , There were couple of -WComment warnings .

[neerajbadlani]

http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20141201/247612.html

[dsanders]

Hi Neeraj,

Chad and I aren't the people you need approval from for this. On the trunk, anyone can review and give their approval (and commit on your behalf) but to get a patch accepted onto a stable release branch you normally need code owner approval (Chris Lattner as far as I can tell in this case, nobody else seemed to cover it), and release manager approval (Tom Stellard). I've CC'd both of them on the original thread and said that I think it's fine (although my opinion doesn't really count under the rules) and I'm sure Tom will accept the two merges when he gets to it. He's had quite a few merge requests in the last couple weeks (nearly 60 from me alone :-) ).

See http://lists.cs.uiuc.edu/pipermail/llvmdev/2014-September/076672.html. The rules are also at http://llvm.org/docs/HowToReleaseLLVM.html#release-patch-rules but they don't seem to have been updated for the rule change that was introduced for 3.5.1.

[mcrosier]

Daniel is correct. Committing to the release branch has additional restrictions. Thanks, Daniel.

[neerajbadlani]

Thanks guys , will keep that in mind for future .
@dsanders : Thanks for the links .

lib/Transforms/Scalar/MergedLoadStoreMotion.cpp

 //
 //            header:
 //                     br %cond, label %if.then, label %if.else
-//                        /                    \
-//                       /                      \
-//                      /                        \
+//                        +                    +
+//                       +                      +
+//                      +                        +
 //            if.then:                         if.else:
 //               %lt = load %addr_l               %le = load %addr_l
 //               <use %lt>                        <use %le>
 //               <...>                            <...>
 //               store %st, %addr_s               store %se, %addr_s
 //               br label %if.end                 br label %if.end
-//                     \                         /
-//                      \                       /
-//                       \                     /
+//                     +                         +
+//                      +                       +
+//                       +                     +
 //            if.end ("footer"):
 //                     <...>
 //

 //            header:
 //                     %l = load %addr_l
 //                     br %cond, label %if.then, label %if.else
-//                        /                    \
-//                       /                      \
-//                      /                        \
+//                        +                    +
+//                       +                      +
+//                      +                        +
 //            if.then:                         if.else:
 //               <use %l>                         <use %l>
 //               <...>                            <...>
 //               br label %if.end                 br label %if.end
-//                      \                        /
-//                       \                      /
-//                        \                    /
+//                      +                        +
+//                       +                      +
+//                        +                    +
 //            if.end ("footer"):
 //                     %s.sink = phi [%st, if.then], [%se, if.else]
 //                     <...>

unittests/Analysis/LazyCallGraphTest.cpp

   return M;
 }
 
-// IR forming a call graph with a diamond of triangle-shaped SCCs:
-//
-//         d1
-//        /  \
-//       d3--d2
-//      /     \
-//     b1     c1
-//   /  \    /  \
-//  b3--b2  c3--c2
-//       \  /
-//        a1
-//       /  \
-//      a3--a2
-//
-// All call edges go up between SCCs, and clockwise around the SCC.
+/*
+   IR forming a call graph with a diamond of triangle-shaped SCCs:
+
+           d1
+          /  \
+         d3--d2
+        /     \
+       b1     c1
+     /  \    /  \
+    b3--b2  c3--c2
+         \  /
+          a1
+         /  \
+        a3--a2
+
+   All call edges go up between SCCs, and clockwise around the SCC.
+ */
 static const char DiamondOfTriangles[] =
      "define void @a1() {\n"
      "entry:\n"