Fix typo in an assert message (KhronosGroup#220)

* Fix typo in an assert message and get rid of build warnings. Value of size_t type is always >= 0; Use explicit conversion from uint64_t to unsigned.
doe300 · Aug 16, 2017 · d28c6f4 · d28c6f4
1 parent 0d6cd12
commit d28c6f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp b/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp
@@ -84,7 +84,7 @@ SPIRVDecorateGeneric::getDecorateKind()const {
 
 SPIRVWord
 SPIRVDecorateGeneric::getLiteral(size_t i) const {
-  assert(0 <= i && i <= Literals.size() && "Out of bounds");
+  assert(i <= Literals.size() && "Out of bounds");
   return Literals[i];
 }
 

diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.cpp b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
@@ -924,7 +924,7 @@ SPIRVModuleImpl::addConstant(SPIRVType *Ty, uint64_t V) {
 SPIRVValue *
 SPIRVModuleImpl::addIntegerConstant(SPIRVTypeInt *Ty, uint64_t V) {
   if (Ty->getBitWidth() == 32) {
-    unsigned I32 = V;
+    unsigned I32 = static_cast<unsigned>(V);
     assert(I32 == V && "Integer value truncated");
     return getLiteralAsConstant(I32);
   }

diff --git a/lib/SPIRV/libSPIRV/SPIRVType.cpp b/lib/SPIRV/libSPIRV/SPIRVType.cpp
@@ -1,4 +1,4 @@
-//===- SPIRVtype.cpp – Class to represent a SPIR-V type ----------*- C++ -*-===//
+//===- SPIRVtype.cpp – Class to represent a SPIR-V type ----------*- C++ -*-===//
 //
 //                     The LLVM/SPIRV Translator
 //
@@ -70,7 +70,7 @@ SPIRVType::getBitWidth() const {
 
 SPIRVWord
 SPIRVType::getFloatBitWidth()const {
-  assert(OpCode == OpTypeFloat && "Not an integer type");
+  assert(OpCode == OpTypeFloat && "Not a float type");
   return static_cast<const SPIRVTypeFloat *const>(this)->getBitWidth();
 }