[LLVMdev] Fixes to release_36 from master

[Hans Wennborg]

Merged in r228984 and r228985, respectively.

Cheers,
Hans

On Thu, Feb 12, 2015 at 3:30 PM, Adrian Prantl <aprantl at apple.com> wrote:
> Yes both should be safe and allow the debug info verifier to not get stuck in an infinite loops when it comes across malformed (=outdated) metadata.
>
> -- adrian
>> On Feb 12, 2015, at 3:26 PM, Hans Wennborg <hans at chromium.org> wrote:
>>
>> Adrian, are these safe to merge?
>>
>> They seem to apply cleanly on the branch.
>>
>> On Thu, Feb 12, 2015 at 2:51 PM, Sumanth Gundapaneni
>> <sgundapa at codeaurora.org> wrote:
>>> Hi Hans,
>>>
>>>                I have attached a unit test which demonstrates a
>>> hang/infinite loop with the opt built with release_36 sources.
>>>
>>> The fixes are already pushed to “master” branch. The revisions r226588 and
>>> r226616  should be pushed to release_36 to fix the unit test.
>>>
>>>
>>>
>>> --Sumanth G
>