<div dir="ltr">Agree, simplified the code in r232521.<div>Thanks! </div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 17, 2015 at 10:27 AM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">+kcc<br>
<div><div class="h5"><br>
> On 2015-Mar-16, at 02:53, Gabor Horvath <<a href="mailto:xazax.hun@gmail.com">xazax.hun@gmail.com</a>> wrote:<br>
><br>
> Author: xazax<br>
> Date: Mon Mar 16 04:53:42 2015<br>
> New Revision: 232366<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=232366&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=232366&view=rev</a><br>
> Log:<br>
> [llvm] Replacing asserts with static_asserts where appropriate<br>
><br>
> Summary:<br>
> This patch consists of the suggestions of clang-tidy/misc-static-assert check.<br>
><br>
><br>
> Reviewers: alexfh<br>
><br>
> Reviewed By: alexfh<br>
><br>
> Subscribers: xazax.hun, llvm-commits<br>
><br>
> Differential Revision: <a href="http://reviews.llvm.org/D8343" target="_blank">http://reviews.llvm.org/D8343</a><br>
><br>
> Modified:<br>
> llvm/trunk/lib/CodeGen/MachineVerifier.cpp<br>
> llvm/trunk/lib/CodeGen/SlotIndexes.cpp<br>
> llvm/trunk/lib/MC/MCDwarf.cpp<br>
> llvm/trunk/lib/Support/FoldingSet.cpp<br>
> llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp<br>
> llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
> llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
> llvm/trunk/unittests/ADT/SCCIteratorTest.cpp<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/MachineVerifier.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineVerifier.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineVerifier.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/CodeGen/MachineVerifier.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/MachineVerifier.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -739,7 +739,7 @@ void MachineVerifier::verifyInlineAsm(co<br>
> if (!isUInt<5>(MI->getOperand(1).getImm()))<br>
> report("Unknown asm flags", &MI->getOperand(1), 1);<br>
><br>
> - assert(InlineAsm::MIOp_FirstOperand == 2 && "Asm format changed");<br>
> + static_assert(InlineAsm::MIOp_FirstOperand == 2, "Asm format changed");<br>
><br>
> unsigned OpNo = InlineAsm::MIOp_FirstOperand;<br>
> unsigned NumOps;<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/SlotIndexes.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SlotIndexes.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SlotIndexes.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/CodeGen/SlotIndexes.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/SlotIndexes.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -127,7 +127,7 @@ void SlotIndexes::renumberIndexes() {<br>
> void SlotIndexes::renumberIndexes(IndexList::iterator curItr) {<br>
> // Number indexes with half the default spacing so we can catch up quickly.<br>
> const unsigned Space = SlotIndex::InstrDist/2;<br>
> - assert((Space & 3) == 0 && "InstrDist must be a multiple of 2*NUM");<br>
> + static_assert((Space & 3) == 0, "InstrDist must be a multiple of 2*NUM");<br>
><br>
> IndexList::iterator startItr = std::prev(curItr);<br>
> unsigned index = startItr->getIndex();<br>
><br>
> Modified: llvm/trunk/lib/MC/MCDwarf.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDwarf.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDwarf.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/MC/MCDwarf.cpp (original)<br>
> +++ llvm/trunk/lib/MC/MCDwarf.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -243,7 +243,9 @@ std::pair<MCSymbol *, MCSymbol *> MCDwar<br>
> 0, // length of DW_LNS_set_epilogue_begin<br>
> 1 // DW_LNS_set_isa<br>
> };<br>
> - assert(array_lengthof(StandardOpcodeLengths) == (DWARF2_LINE_OPCODE_BASE - 1));<br>
> + static_assert(array_lengthof(StandardOpcodeLengths) ==<br>
> + (DWARF2_LINE_OPCODE_BASE - 1),<br>
> + "");<br>
> return Emit(MCOS, StandardOpcodeLengths);<br>
> }<br>
><br>
><br>
> Modified: llvm/trunk/lib/Support/FoldingSet.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/FoldingSet.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/FoldingSet.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Support/FoldingSet.cpp (original)<br>
> +++ llvm/trunk/lib/Support/FoldingSet.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -101,6 +101,8 @@ void FoldingSetNodeID::AddString(StringR<br>
> // Otherwise do it the hard way.<br>
> // To be compatible with above bulk transfer, we need to take endianness<br>
> // into account.<br>
> + static_assert(sys::IsBigEndianHost || sys::IsLittleEndianHost,<br>
> + "Unexpected host endianness");<br>
> if (sys::IsBigEndianHost) {<br>
> for (Pos += 4; Pos <= Size; Pos += 4) {<br>
> unsigned V = ((unsigned char)String[Pos - 4] << 24) |<br>
> @@ -109,8 +111,7 @@ void FoldingSetNodeID::AddString(StringR<br>
> (unsigned char)String[Pos - 1];<br>
> Bits.push_back(V);<br>
> }<br>
> - } else {<br>
> - assert(sys::IsLittleEndianHost && "Unexpected host endianness");<br>
> + } else { // Little-endian host<br>
> for (Pos += 4; Pos <= Size; Pos += 4) {<br>
> unsigned V = ((unsigned char)String[Pos - 1] << 24) |<br>
> ((unsigned char)String[Pos - 2] << 16) |<br>
><br>
> Modified: llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp (original)<br>
> +++ llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -300,7 +300,7 @@ bool FPS::runOnMachineFunction(MachineFu<br>
> // function. If it is all integer, there is nothing for us to do!<br>
> bool FPIsUsed = false;<br>
><br>
> - assert(X86::FP6 == X86::FP0+6 && "Register enums aren't sorted right!");<br>
> + static_assert(X86::FP6 == X86::FP0+6, "Register enums aren't sorted right!");<br>
> for (unsigned i = 0; i <= 6; ++i)<br>
> if (MF.getRegInfo().isPhysRegUsed(X86::FP0+i)) {<br>
> FPIsUsed = true;<br>
><br>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)<br>
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -17841,7 +17841,8 @@ X86TargetLowering::EmitVAARG64WithCustom<br>
> // 9 ) EFLAGS (implicit-def)<br>
><br>
> assert(MI->getNumOperands() == 10 && "VAARG_64 should have 10 operands!");<br>
> - assert(X86::AddrNumOperands == 5 && "VAARG_64 assumes 5 address operands");<br>
> + static_assert(X86::AddrNumOperands == 5,<br>
> + "VAARG_64 assumes 5 address operands");<br>
><br>
> unsigned DestReg = MI->getOperand(0).getReg();<br>
> MachineOperand &Base = MI->getOperand(1);<br>
><br>
> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)<br>
> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -1621,7 +1621,11 @@ static int StackMallocSizeClass(uint64_t<br>
> void FunctionStackPoisoner::SetShadowToStackAfterReturnInlined(<br>
> IRBuilder<> &IRB, Value *ShadowBase, int Size) {<br>
> assert(!(Size % 8));<br>
> - assert(kAsanStackAfterReturnMagic == 0xf5);<br>
> +<br>
> + #ifndef NDEBUG<br>
> + static_assert(kAsanStackAfterReturnMagic == 0xf5, "");<br>
> + #endif<br>
> +<br>
<br>
</div></div>Is this really necessary? I see that:<br>
<br>
#ifndef NDEBUG<br>
static const int kAsanStackAfterReturnMagic = 0xf5;<br>
#endif<br>
<br>
Why not remove the `NDEBUG` from there?<br>
<br>
Moreover, why do we define a constant just to assert what its value is?<br>
Looking at the original commit (r190863), there was some commented out<br>
code using the variable, but it has since been removed.<br>
<br>
@kcc, should we remove this constant now?<br>
<div class="HOEnZb"><div class="h5"><br>
> for (int i = 0; i < Size; i += 8) {<br>
> Value *p = IRB.CreateAdd(ShadowBase, ConstantInt::get(IntptrTy, i));<br>
> IRB.CreateStore(ConstantInt::get(IRB.getInt64Ty(), 0xf5f5f5f5f5f5f5f5ULL),<br>
><br>
> Modified: llvm/trunk/unittests/ADT/SCCIteratorTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/SCCIteratorTest.cpp?rev=232366&r1=232365&r2=232366&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/SCCIteratorTest.cpp?rev=232366&r1=232365&r2=232366&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/unittests/ADT/SCCIteratorTest.cpp (original)<br>
> +++ llvm/trunk/unittests/ADT/SCCIteratorTest.cpp Mon Mar 16 04:53:42 2015<br>
> @@ -250,7 +250,7 @@ TEST(SCCIteratorTest, AllSmallGraphs) {<br>
> typedef Graph<NUM_NODES> GT;<br>
><br>
> /// Enumerate all graphs using NUM_GRAPHS bits.<br>
> - assert(NUM_GRAPHS < sizeof(unsigned) * CHAR_BIT && "Too many graphs!");<br>
> + static_assert(NUM_GRAPHS < sizeof(unsigned) * CHAR_BIT, "Too many graphs!");<br>
> for (unsigned GraphDescriptor = 0; GraphDescriptor < (1U << NUM_GRAPHS);<br>
> ++GraphDescriptor) {<br>
> GT G;<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
</div></div></blockquote></div><br></div>