[llvm] r226232 - This should fix the build bot clang-cmake-armv7-a15-full failing on

[Kevin Enderby]

Hi Eric,

Oddly the code works, in this case prints the correct size.  But only fails for this bot on this test.  I’m actively working on a better fix.  If you really feel this code needs to be reverted while make this fix I can do that.

Kev

> On Jan 16, 2015, at 11:15 AM, Eric Christopher <echristo at gmail.com> wrote:
> 
> Hi Kevin,
> 
> Should you instead revert the code until you can get it working? I'm just concerned with the deletion and no real way of knowing what the actual issue was here.
> 
> Thanks! and yeah, breakage happens :)
> 
> -eric
> 
> On Fri Jan 16 2015 at 11:06:57 AM Kevin Enderby <enderby at apple.com <mailto:enderby at apple.com>> wrote:
> It was a late night guess, and an incorrect one.  I removed the test in r226241 last night before I went home and am working on a “better guess now” :)
> 
> Again sorry for the breakage,
> Kev
> 
>> On Jan 16, 2015, at 11:04 AM, Eric Christopher <echristo at gmail.com <mailto:echristo at gmail.com>> wrote:
>> 
>> Hi Kevin,
>> 
>> How was this supposed to fix the failure?
>> 
>> -eric
>> 
>> On Thu Jan 15 2015 at 4:31:32 PM Kevin Enderby <enderby at apple.com <mailto:enderby at apple.com>> wrote:
>> Author: enderby
>> Date: Thu Jan 15 18:27:31 2015
>> New Revision: 226232
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=226232&view=rev <http://llvm.org/viewvc/llvm-project?rev=226232&view=rev>
>> Log:
>> This should fix the build bot clang-cmake-armv7-a15-full failing on
>> the macho-archive-headers.test added with r226228.
>> 
>> Modified:
>>     llvm/trunk/lib/Object/Archive.cpp
>> 
>> Modified: llvm/trunk/lib/Object/Archive.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Archive.cpp?rev=226232&r1=226231&r2=226232&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Archive.cpp?rev=226232&r1=226231&r2=226232&view=diff>
>> ==============================================================================
>> --- llvm/trunk/lib/Object/Archive.cpp (original)
>> +++ llvm/trunk/lib/Object/Archive.cpp Thu Jan 15 18:27:31 2015
>> @@ -111,8 +111,6 @@ uint64_t Archive::Child::getSize() const
>>  }
>> 
>>  uint64_t Archive::Child::getRawSize() const {
>> -  if (Parent->IsThin)
>> -    return getHeader()->getSize();
>>    return Data.size();
>>  }
>> 
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu <mailto:llvm-commits at cs.uiuc.edu>
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits <http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits>
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150116/67d9f8a0/attachment.html>