[llvm-commits] [llvm] r157380 - in /llvm/trunk/lib/Target/NVPTX: NVPTXAsmPrinter.cpp NVPTXAsmPrinter.h NVPTXInstrInfo.cpp NVPTXRegisterInfo.cpp VectorElementize.cpp
Craig Topper
craig.topper at gmail.com
Thu May 24 00:02:50 PDT 2012
Author: ctopper
Date: Thu May 24 02:02:50 2012
New Revision: 157380
URL: http://llvm.org/viewvc/llvm-project?rev=157380&view=rev
Log:
Convert assert(0) to llvm_unreachable.
Modified:
llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h
llvm/trunk/lib/Target/NVPTX/NVPTXInstrInfo.cpp
llvm/trunk/lib/Target/NVPTX/NVPTXRegisterInfo.cpp
llvm/trunk/lib/Target/NVPTX/VectorElementize.cpp
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp?rev=157380&r1=157379&r2=157380&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp Thu May 24 02:02:50 2012
@@ -478,7 +478,7 @@
<< getNVPTXRegClassStr(RC) << mapped_vr << "_1"
<< "}";
else
- assert(0 && "Unsupported vector size");
+ llvm_unreachable("Unsupported vector size");
}
void
@@ -519,7 +519,7 @@
O << "_" << vecelem[Imm%2];
}
else
- assert(0 && "Unknown Modifier on immediate operand");
+ llvm_unreachable("Unknown Modifier on immediate operand");
}
void NVPTXAsmPrinter::printOperand(const MachineInstr *MI, int opNum,
@@ -539,7 +539,7 @@
if (strcmp(Modifier, "vecfull") == 0)
emitVirtualRegister(MO.getReg(), true, O);
else
- assert(0 &&
+ llvm_unreachable(
"Don't know how to handle the modifier on virtual register.");
}
}
@@ -551,7 +551,7 @@
else if (strstr(Modifier, "vec") == Modifier)
printVecModifiedImmediate(MO, Modifier, O);
else
- assert(0 && "Don't know how to handle modifier on immediate operand");
+ llvm_unreachable("Don't know how to handle modifier on immediate operand");
return;
case MachineOperand::MO_FPImmediate:
@@ -584,7 +584,7 @@
return;
default:
- assert(0 && " Operand type not supported.");
+ llvm_unreachable("Operand type not supported.");
}
}
@@ -1257,7 +1257,7 @@
O << "shared" ;
break;
default:
- assert(0 && "unexpected address space");
+ llvm_unreachable("unexpected address space");
}
}
@@ -1748,8 +1748,7 @@
ptr = (unsigned char*)&int32;
aggBuffer->addBytes(ptr, 4, Bytes);
break;
- }
- else if (ConstantExpr *Cexpr = dyn_cast<ConstantExpr>(CPV)) {
+ } else if (ConstantExpr *Cexpr = dyn_cast<ConstantExpr>(CPV)) {
if (ConstantInt *constInt =
dyn_cast<ConstantInt>(ConstantFoldConstantExpression(
Cexpr, TD))) {
@@ -1765,15 +1764,14 @@
break;
}
}
- assert(0 && "unsupported integer const type");
+ llvm_unreachable("unsupported integer const type");
} else if (ETy == Type::getInt64Ty(CPV->getContext()) ) {
if (ConstantInt *constInt = dyn_cast<ConstantInt>(CPV)) {
long long int64 =(long long)(constInt->getZExtValue());
ptr = (unsigned char*)&int64;
aggBuffer->addBytes(ptr, 8, Bytes);
break;
- }
- else if (ConstantExpr *Cexpr = dyn_cast<ConstantExpr>(CPV)) {
+ } else if (ConstantExpr *Cexpr = dyn_cast<ConstantExpr>(CPV)) {
if (ConstantInt *constInt = dyn_cast<ConstantInt>(
ConstantFoldConstantExpression(Cexpr, TD))) {
long long int64 =(long long)(constInt->getZExtValue());
@@ -1789,8 +1787,7 @@
}
}
llvm_unreachable("unsupported integer const type");
- }
- else
+ } else
llvm_unreachable("unsupported integer const type");
break;
}
@@ -1887,7 +1884,7 @@
}
return;
}
- assert(0 && "unsupported constant type in printAggregateConstant()");
+ llvm_unreachable("unsupported constant type in printAggregateConstant()");
}
// buildTypeNameMap - Run through symbol table looking for type names.
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h?rev=157380&r1=157379&r2=157380&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h Thu May 24 02:02:50 2012
@@ -148,8 +148,7 @@
O << ", ";
O << (unsigned int)buffer[i];
}
- }
- else {
+ } else {
// print out in 4-bytes or 8-bytes
unsigned int pos = 0;
unsigned int nSym = 0;
@@ -169,16 +168,14 @@
else if (ConstantExpr *Cexpr =
dyn_cast<ConstantExpr>(v)) {
O << *nvptx::LowerConstant(Cexpr, AP);
- }
- else
- assert(0 && "symbol type unknown");
+ } else
+ llvm_unreachable("symbol type unknown");
nSym++;
if (nSym >= numSymbols)
nextSymbolPos = size+1;
else
nextSymbolPos = symbolPosInBuffer[nSym];
- }
- else
+ } else
if (nBytes == 4)
O << *(unsigned int*)(buffer+pos);
else
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXInstrInfo.cpp?rev=157380&r1=157379&r2=157380&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXInstrInfo.cpp Thu May 24 02:02:50 2012
@@ -106,7 +106,7 @@
BuildMI(MBB, I, DL, get(NVPTX::V2f64Mov), DestReg)
.addReg(SrcReg, getKillRegState(KillSrc));
else {
- assert(0 && "Don't know how to copy a register");
+ llvm_unreachable("Don't know how to copy a register");
}
}
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXRegisterInfo.cpp?rev=157380&r1=157379&r2=157380&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXRegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXRegisterInfo.cpp Thu May 24 02:02:50 2012
@@ -196,8 +196,7 @@
return getNVPTXRegClassName(&NVPTX::Int32RegsRegClass);
if (RC->getID() == NVPTX::V4I8RegsRegClassID)
return getNVPTXRegClassName(&NVPTX::Int8RegsRegClass);
- assert(0 && "Not a vector register class");
- return "Unsupported";
+ llvm_unreachable("Not a vector register class");
}
const TargetRegisterClass *getNVPTXElemClass(TargetRegisterClass const *RC) {
@@ -221,8 +220,7 @@
return (&NVPTX::Int32RegsRegClass);
if (RC->getID() == NVPTX::V4I8RegsRegClassID)
return (&NVPTX::Int8RegsRegClass);
- assert(0 && "Not a vector register class");
- return 0;
+ llvm_unreachable("Not a vector register class");
}
int getNVPTXVectorSize(TargetRegisterClass const *RC) {
@@ -246,8 +244,7 @@
return 4;
if (RC->getID() == NVPTX::V4I8RegsRegClassID)
return 4;
- assert(0 && "Not a vector register class");
- return -1;
+ llvm_unreachable("Not a vector register class");
}
}
Modified: llvm/trunk/lib/Target/NVPTX/VectorElementize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/VectorElementize.cpp?rev=157380&r1=157379&r2=157380&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/VectorElementize.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/VectorElementize.cpp Thu May 24 02:02:50 2012
@@ -731,9 +731,7 @@
if (opcode == NVPTX::IMPLICIT_DEF)
return opcode;
switch(opcode) {
- default:
- assert(0 && "Scalar version not set, fix NVPTXVector.td");
- return 0;
+ default: llvm_unreachable("Scalar version not set, fix NVPTXVector.td");
case TargetOpcode::COPY: return TargetOpcode::COPY;
case NVPTX::AddCCCV2I32: return NVPTX::ADDCCCi32rr;
case NVPTX::AddCCCV4I32: return NVPTX::ADDCCCi32rr;
More information about the llvm-commits
mailing list