Merging r259696:
authorHans Wennborg <hans@hanshq.net>
Mon, 8 Feb 2016 18:31:49 +0000 (18:31 +0000)
committerHans Wennborg <hans@hanshq.net>
Mon, 8 Feb 2016 18:31:49 +0000 (18:31 +0000)
commit777479f80202057f041683129d4fd9e574ffea79
tree8afda2f0ec18268ec33a73ac6676f984df73a6c6
parent7ecd92d75cda45668b6b5fdbcdd2142826514e66
Merging r259696:
------------------------------------------------------------------------
r259696 | kfischer | 2016-02-03 13:13:33 -0800 (Wed, 03 Feb 2016) | 12 lines

[DWARFDebug] Fix another case of overlapping ranges

Summary:
In r257979, I added code to ensure that we wouldn't merge DebugLocEntries if
the pieces they describe overlap. Unfortunately, I failed to cover the case,
where there may have multiple active Expressions in the entry, in which case we
need to make sure that no two values overlap before we can perform the merge.

This fixed PR26148.

Reviewers: aprantl
Differential Revision: http://reviews.llvm.org/D16742
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@260121 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
test/DebugInfo/X86/PR26148.ll [new file with mode: 0644]