Fix merge conflict & minor test output differences
authorDavid Majnemer <david.majnemer@gmail.com>
Mon, 8 Dec 2014 09:10:57 +0000 (09:10 +0000)
committerDavid Majnemer <david.majnemer@gmail.com>
Mon, 8 Dec 2014 09:10:57 +0000 (09:10 +0000)
commitf38406688d8013baeb86d5f2ee895217b3a9f28c
tree99104c32bdd7ad2aa32089cdc15ebb7140a431e3
parente7ec6be8c2016cf6dab8836f3b088f64d7912d5e
Fix merge conflict & minor test output differences

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@223643 91177308-0d34-0410-b5e6-96231b3b80d8
test/Transforms/SROA/phi-and-select.ll