AMDGPU: Fix bug causing crash due to invalid opencl version metadata.

[arsenm]

lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

791 ↗

(On Diff #64540)

Should use unsigned or uint16_t

[yaxunl]

Revised by Matt's comments.

[nhaustov]

Ok.

[yaxunl]

The last update missed a file. Update again.

llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

 
 void AMDGPUAsmPrinter::emitStartOfRuntimeMetadata(const Module &M) {
   OutStreamer->SwitchSection(getObjFileLowering().getContext()
     .getELFSection(RuntimeMD::SectionName, ELF::SHT_PROGBITS, 0));
 
   emitRuntimeMDIntValue(OutStreamer, RuntimeMD::KeyMDVersion,
                         RuntimeMD::MDVersion << 8 | RuntimeMD::MDRevision, 2);
   if (auto MD = M.getNamedMetadata("opencl.ocl.version")) {
+    if (MD->getNumOperands()) {
+      auto Node = MD->getOperand(0);
+      if (Node->getNumOperands() > 1) {
         emitRuntimeMDIntValue(OutStreamer, RuntimeMD::KeyLanguage,
                               RuntimeMD::OpenCL_C, 1);
-    auto Node = MD->getOperand(0);
-    unsigned short Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
-                             ->getZExtValue();
-    unsigned short Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
-                             ->getZExtValue();
+        uint16_t Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
+        uint16_t Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
         emitRuntimeMDIntValue(OutStreamer, RuntimeMD::KeyLanguageVersion,
                               Major * 100 + Minor * 10, 2);
       }
     }
+  }
+}
 
 static std::string getOCLTypeName(Type *Ty, bool isSigned) {
   if (VectorType* VecTy = dyn_cast<VectorType>(Ty)) {
     Type* EleTy = VecTy->getElementType();
     unsigned Size = VecTy->getVectorNumElements();
     return (Twine(getOCLTypeName(EleTy, isSigned)) + Twine(Size)).str();
   }
   switch (Ty->getTypeID()) {

llvm/trunk/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll

+; RUN: llc -mtriple=amdgcn--amdhsa < %s | FileCheck %s
+; check llc does not crash for invalid opencl version metadata
+
+; CHECK: .section        .AMDGPU.runtime_metadata
+; CHECK-NEXT: .byte 1
+; CHECK-NEXT: .short  256
+
+!opencl.ocl.version = !{}

llvm/trunk/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll

+; RUN: llc -mtriple=amdgcn--amdhsa < %s | FileCheck %s
+; check llc does not crash for invalid opencl version metadata
+
+; CHECK: .section        .AMDGPU.runtime_metadata
+; CHECK-NEXT: .byte 1
+; CHECK-NEXT: .short  256
+
+!opencl.ocl.version = !{!0}
+!0 = !{}

llvm/trunk/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll

+; RUN: llc -mtriple=amdgcn--amdhsa < %s | FileCheck %s
+; check llc does not crash for invalid opencl version metadata
+
+; CHECK: .section        .AMDGPU.runtime_metadata
+; CHECK-NEXT: .byte 1
+; CHECK-NEXT: .short  256
+
+!opencl.ocl.version = !{!0}
+!0 = !{i32 1}