Reverting the files.

Author: zahiraam

llvm-spirv/lib/SPIRV/SPIRVToOCL.cpp

@@ -537,7 +537,8 @@ llvm::createSPIRVBIsLoweringPass(Module &M,
   case SPIRV::BIsRepresentation::SPIRVFriendlyIR:
     // nothing to do, already done
     return nullptr;
+  default:
+    llvm_unreachable("Unsupported built-ins representation");
+    return nullptr;
   }
-  llvm_unreachable("Unsupported built-ins representation");
-  return nullptr;
 }

llvm-spirv/lib/SPIRV/SPIRVToOCL.h

@@ -51,7 +51,7 @@ class SPIRVToOCL : public ModulePass, public InstVisitor<SPIRVToOCL> {
   SPIRVToOCL(char &ID) : ModulePass(ID), M(nullptr), Ctx(nullptr) {}
 
 public:
-  virtual bool runOnModule(Module &M) override = 0;
+  virtual bool runOnModule(Module &M) = 0;
 
   void visitCallInst(CallInst &CI);
 

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -2529,14 +2529,12 @@ SPIRVValue *LLVMToSPIRV::transIntrinsicInst(IntrinsicInst *II,
     MemSetInst *MSI = cast<MemSetInst>(II);
     Value *Val = MSI->getValue();
     if (!isa<Constant>(Val)) {
-      assert(false &&
-             "Can't translate llvm.memset with non-const `value` argument");
+      assert(!"Can't translate llvm.memset with non-const `value` argument");
       return nullptr;
     }
     Value *Len = MSI->getLength();
     if (!isa<ConstantInt>(Len)) {
-      assert(false &&
-             "Can't translate llvm.memset with non-const `length` argument");
+      assert(!"Can't translate llvm.memset with non-const `length` argument");
       return nullptr;
     }
     uint64_t NumElements = static_cast<ConstantInt *>(Len)->getZExtValue();

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.h

@@ -504,9 +504,10 @@ class SPIRVModule {
       return SPIRVEIS_Debug;
     case DebugInfoEIS::OpenCL_DebugInfo_100:
       return SPIRVEIS_OpenCL_DebugInfo_100;
+    default:
+      assert(false && "Unexpected debug info EIS!");
+      return SPIRVEIS_Debug;
     }
-    assert(false && "Unexpected debug info EIS!");
-    return SPIRVEIS_Debug;
   }
 
   BIsRepresentation getDesiredBIsRepresentation() const {