diff options
| -rw-r--r-- | lib/Target/NVPTX/NVPTXAsmPrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/NVPTX/NVPTXISelLowering.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/lib/Target/NVPTX/NVPTXAsmPrinter.cpp index f268b4aae4..c2eb894f03 100644 --- a/lib/Target/NVPTX/NVPTXAsmPrinter.cpp +++ b/lib/Target/NVPTX/NVPTXAsmPrinter.cpp @@ -490,7 +490,7 @@ NVPTXAsmPrinter::emitVirtualRegister(unsigned int vr, bool isVec, void NVPTXAsmPrinter::printVecModifiedImmediate(const MachineOperand &MO, const char *Modifier, raw_ostream &O) { -char vecelem[] = {'0', '1', '2', '3', '0', '1', '2', '3'}; + static const char vecelem[] = {'0', '1', '2', '3', '0', '1', '2', '3'}; int Imm = (int)MO.getImm(); if(0 == strcmp(Modifier, "vecelem")) O << "_" << vecelem[Imm]; diff --git a/lib/Target/NVPTX/NVPTXISelLowering.cpp b/lib/Target/NVPTX/NVPTXISelLowering.cpp index d326805b22..d517e8117b 100644 --- a/lib/Target/NVPTX/NVPTXISelLowering.cpp +++ b/lib/Target/NVPTX/NVPTXISelLowering.cpp @@ -887,10 +887,10 @@ NVPTXTargetLowering::getParamHelpSymbol(SelectionDAG &DAG, int idx) { // Check to see if the kernel argument is image*_t or sampler_t bool llvm::isImageOrSamplerVal(const Value *arg, const Module *context) { - const char *specialTypes[] = { - "struct._image2d_t", - "struct._image3d_t", - "struct._sampler_t" + static const char *const specialTypes[] = { + "struct._image2d_t", + "struct._image3d_t", + "struct._sampler_t" }; const Type *Ty = arg->getType(); @@ -905,7 +905,7 @@ bool llvm::isImageOrSamplerVal(const Value *arg, const Module *context) { const StructType *STy = dyn_cast<StructType>(PTy->getElementType()); const std::string TypeName = STy ? STy->getName() : ""; - for (int i=0, e=sizeof(specialTypes)/sizeof(specialTypes[0]); i!=e; ++i) + for (int i = 0, e = array_lengthof(specialTypes); i != e; ++i) if (TypeName == specialTypes[i]) return true; |