Convert integers to string before adding to string

Adding an integer to a string literal does not append it to the string.

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/SPIRV/SPIRVReader.cpp b/lib/SPIRV/SPIRVReader.cpp
index e08420a..b9cf2c1 100644
--- a/lib/SPIRV/SPIRVReader.cpp
+++ b/lib/SPIRV/SPIRVReader.cpp
@@ -2508,7 +2508,7 @@ bool SPIRVToLLVM::transAddressingModel() {
   default:
     SPIRVCKRT(0, InvalidAddressingModel,
               "Actual addressing mode is " +
-                  (unsigned)BM->getAddressingModel());
+                  std::to_string(BM->getAddressingModel()));
   }
   return true;
 }
diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.cpp b/lib/SPIRV/libSPIRV/SPIRVEntry.cpp
index 52a04ef..cf827b6 100644
--- a/lib/SPIRV/libSPIRV/SPIRVEntry.cpp
+++ b/lib/SPIRV/libSPIRV/SPIRVEntry.cpp
@@ -508,8 +508,9 @@ void SPIRVMemoryModel::decode(std::istream &I) {
 void SPIRVMemoryModel::validate() const {
   auto AM = Module->getAddressingModel();
   auto MM = Module->getMemoryModel();
-  SPIRVCK(isValid(AM), InvalidAddressingModel, "Actual is " + AM);
-  SPIRVCK(isValid(MM), InvalidMemoryModel, "Actual is " + MM);
+  SPIRVCK(isValid(AM), InvalidAddressingModel,
+          "Actual is " + std::to_string(AM));
+  SPIRVCK(isValid(MM), InvalidMemoryModel, "Actual is " + std::to_string(MM));
 }
 
 void SPIRVSource::encode(spv_ostream &O) const {