[llvm] r239431 - Use AlignOf traits to enable static_assert.

[Kaelyn Takata]

On Tue, Jun 9, 2015 at 4:35 PM, Pete Cooper <peter_cooper at apple.com> wrote:

>
> On Jun 9, 2015, at 4:31 PM, David Blaikie <dblaikie at gmail.com> wrote:
>
> Can probably be suppressed by casting one side to int, etc.
>
> Though we /probably/ should fix the warning to not fire on anonymous
> unions as they're often used as zero-space constants.
>
> On Tue, Jun 9, 2015 at 4:27 PM, Kaelyn Takata <rikka at google.com> wrote:
>
>> FYI, this causes a build failure with -Werror and -Wenum-compare:
>>
>> lib/MC/MCSymbol.cpp:32:46: error: comparison between 'enum
>> llvm::AlignOf<llvm::MCSymbol>::<anonymous>' and 'enum
>> llvm::AlignOf<llvm::MCSymbol::NameEntryStorageTy>::<anonymous>'
>> [-Werror=enum-compare]
>>
>> Sorry about that.  I’ll fix it now with the cast as suggested.
>

Thanks! :)


>
> Pete
>
> On Tue, Jun 9, 2015 at 1:58 PM, Pete Cooper <peter_cooper at apple.com>
>> wrote:
>>
>>> Author: pete
>>> Date: Tue Jun  9 15:58:03 2015
>>> New Revision: 239431
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=239431&view=rev
>>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D239431-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=A3AtBjvd0F2ZXuH7fM7H83exqgFdkOTZuZePtHS-rR4&s=W191Am6OnqVvxgyiL9r19U8FTBbkvqwRk7OaTZcbfts&e=>
>>> Log:
>>> Use AlignOf traits to enable static_assert.
>>>
>>> This is better than runtime asserts.  Thanks to David Blaikie for the
>>> help here.
>>>
>>> Modified:
>>>     llvm/trunk/lib/MC/MCSymbol.cpp
>>>
>>> Modified: llvm/trunk/lib/MC/MCSymbol.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCSymbol.cpp?rev=239431&r1=239430&r2=239431&view=diff
>>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_MC_MCSymbol.cpp-3Frev-3D239431-26r1-3D239430-26r2-3D239431-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=A3AtBjvd0F2ZXuH7fM7H83exqgFdkOTZuZePtHS-rR4&s=ND2ehpkWhLcXxwnlAHsODVGYN4UZRPvlNM-9wHNiy7A&e=>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/MC/MCSymbol.cpp (original)
>>> +++ llvm/trunk/lib/MC/MCSymbol.cpp Tue Jun  9 15:58:03 2015
>>> @@ -28,9 +28,9 @@ void *MCSymbol::operator new(size_t s, c
>>>    // For safety, ensure that the alignment of a pointer is enough for an
>>>    // MCSymbol.  This also ensures we don't need padding between the
>>> name and
>>>    // symbol.
>>> -  // FIXME: Use static_assert when constexpr is supported.
>>> -  assert(alignOf<MCSymbol>() <= alignOf<NameEntryStorageTy>() &&
>>> -         "Bad alignment of MCSymbol");
>>> +  static_assert(AlignOf<MCSymbol>::Alignment <=
>>> +                AlignOf<NameEntryStorageTy>::Alignment,
>>> +                "Bad alignment of MCSymbol");
>>>    void *Storage = Ctx.allocate(Size, alignOf<NameEntryStorageTy>());
>>>    NameEntryStorageTy *Start = static_cast<NameEntryStorageTy*>(Storage);
>>>    NameEntryStorageTy *End = Start + (Name ? 1 : 0);
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> 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/20150609/da26f6bb/attachment.html>