[llvm] r185227 - Fix broken asserts that never fire.

[Hal Finkel]

----- Original Message -----
> 
> On Fri, Jun 28, 2013 at 3:04 PM, Hal Finkel < hfinkel at anl.gov >
> wrote:
> 
> 
> 
> 
> 
> ----- Original Message -----
> > Author: rtrieu
> > Date: Fri Jun 28 16:54:25 2013
> > New Revision: 185227
> > 
> > URL: http://llvm.org/viewvc/llvm-project?rev=185227&view=rev
> > Log:
> > Fix broken asserts that never fire.
> > 
> > Change assert("text") to assert(0 && "text"). The first case is a
> > const char *
> > to bool conversion, which always evaluates to true, never
> > triggering
> > the
> > assert. The second case will always trigger the assert.
> 
> Please use llvm_unreachable for all of these.
> 
> -Hal
> 
> 
> 
> Is that the preferred method now? The codebase has many examples of
> assert(0 && "text");

Yes, this is now the preferred method. See: http://llvm.org/docs/CodingStandards.html#assert-liberally

 -Hal

> 
> 
> 
> > 
> > Modified:
> > llvm/trunk/include/llvm/TableGen/Record.h
> > llvm/trunk/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp
> > 
> > Modified: llvm/trunk/include/llvm/TableGen/Record.h
> > URL:
> > http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TableGen/Record.h?rev=185227&r1=185226&r2=185227&view=diff
> > ==============================================================================
> > --- llvm/trunk/include/llvm/TableGen/Record.h (original)
> > +++ llvm/trunk/include/llvm/TableGen/Record.h Fri Jun 28 16:54:25
> > 2013
> > @@ -1799,9 +1799,9 @@ struct LessRecordRegister {
> > 
> > unsigned LHSVal, RHSVal;
> > if (LHSPart.second.getAsInteger(10, LHSVal))
> > - assert("Unable to convert LHS to integer.");
> > + assert(0 && "Unable to convert LHS to integer.");
> > if (RHSPart.second.getAsInteger(10, RHSVal))
> > - assert("Unable to convert RHS to integer.");
> > + assert(0 && "Unable to convert RHS to integer.");
> 
> 
> > if (LHSVal != RHSVal)
> > return LHSVal < RHSVal;
> > }
> > 
> > Modified:
> > llvm/trunk/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp
> > URL:
> > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp?rev=185227&r1=185226&r2=185227&view=diff
> > ==============================================================================
> > ---
> > llvm/trunk/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp
> > (original)
> > +++
> > llvm/trunk/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp
> > Fri Jun 28 16:54:25 2013
> > @@ -179,7 +179,7 @@ void HexagonInstPrinter::printBranchOper
> > raw_ostream &O) const {
> > // Branches can take an immediate operand. This is used by the
> > branch
> > // selection pass to print $+8, an eight byte displacement from
> > the PC.
> > - assert("Unknown branch operand.");
> > + assert(0 && "Unknown branch operand.");
> > }
> > 
> > void HexagonInstPrinter::printCallOperand(const MCInst *MI,
> > unsigned
> > OpNo,
> > @@ -203,7 +203,7 @@ void HexagonInstPrinter::printSymbol(con
> > O << '#';
> > printOperand(MI, OpNo, O);
> > } else {
> > - assert("Unknown symbol operand");
> > + assert(0 && "Unknown symbol operand");
> > printOperand(MI, OpNo, O);
> > }
> 
> 
> > O << ')';
> > 
> > 
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> > 
> 
> --
> Hal Finkel
> Assistant Computational Scientist
> Leadership Computing Facility
> Argonne National Laboratory
> 
> 

-- 
Hal Finkel
Assistant Computational Scientist
Leadership Computing Facility
Argonne National Laboratory