Change the "Cannot merge two portions of the same node yet" from an assertion
into a "oh crap, lets collapse" case


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4530 91177308-0d34-0410-b5e6-96231b3b80d8
1 file changed