Creating release candidate rc3 from release_500 branch

llvm-svn: 311818
llvm-svn: 311817
llvm-svn: 311816
llvm-svn: 311815
llvm-svn: 311814
llvm-svn: 311813
llvm-svn: 311812
llvm-svn: 311811
llvm-svn: 311810
llvm-svn: 311808
llvm-svn: 311807
Merging r311792:
------------------------------------------------------------------------
r311792 | djasper | 2017-08-25 12:14:53 -0700 (Fri, 25 Aug 2017) | 9 lines

[Format] Invert nestingAndIndentLevel pair in WhitespaceManager used for
alignments

Indent should be compared before nesting level to determine if a token
is on the same scope as the one we align with. Because it was inverted,
clang-format sometimes tried to align tokens with tokens from outer
scopes, causing the assert(Shift >= 0) to fire.

This fixes bug #33507. Patch by Beren Minor, thank you!
------------------------------------------------------------------------

llvm-svn: 311800
3 files changed