This fixes https://llvm.org/bugs/show_bug.cgi?id=25329, as well as

misalignments like the following:

  int a, b = 2;
  int c    = 3;

Patch by Beren Minor, thanks!

llvm-svn: 254406