Fix unchecked nullptr dereferences

Fix cases where we create a potential nullptr dereference.
intel · Jan 8, 2024 · 5f6eb9d · 5f6eb9d
1 parent 2ebdd35
commit 5f6eb9d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/IGC/AdaptorCommon/LegalizeFunctionSignatures.h b/IGC/AdaptorCommon/LegalizeFunctionSignatures.h
@@ -26,8 +26,6 @@ class LegalizeFunctionSignatures : public llvm::ModulePass
 
     LegalizeFunctionSignatures();
 
-    ~LegalizeFunctionSignatures() {}
-
     virtual void getAnalysisUsage(llvm::AnalysisUsage& AU) const
     {
         AU.addRequired<IGC::CodeGenContextWrapper>();

diff --git a/IGC/AdaptorOCL/dllInterfaceCompute.cpp b/IGC/AdaptorOCL/dllInterfaceCompute.cpp
@@ -1002,11 +1002,11 @@ void RebuildGlobalAnnotations(IGC::OpenCLProgramContext& oclContext, Module* pKe
     };
 
     std::vector<Constant*> newGlobalAnnotations;
-    auto annotations_array = dyn_cast<ConstantArray>(globalAnnotations->getOperand(0));
+    auto annotations_array = cast<ConstantArray>(globalAnnotations->getOperand(0));
     for (const auto& op : annotations_array->operands())
     {
-        auto annotation_struct = dyn_cast<ConstantStruct>(op.get());
-        auto annotated_function = dyn_cast<Function>(annotation_struct->getOperand(0)->getOperand(0));
+        auto annotation_struct = cast<ConstantStruct>(op.get());
+        auto annotated_function = cast<Function>(annotation_struct->getOperand(0)->getOperand(0));
 
         if (requiresRecompilation(annotated_function))
         {

diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -8677,7 +8677,7 @@ namespace IGC
         LSC_OP subOp = getLSCAtomicOpCode(atomic_op);
 
         VISA_PredOpnd* predOpnd = GetFlagOperand(m_encoderState.m_flag);
-        LSC_ADDR addr;
+        LSC_ADDR addr = {};
         VISA_VectorOpnd* globalOffsetOpnd = nullptr;
         addr.type = LSC_ADDR_TYPE_FLAT;
 

diff --git a/IGC/Compiler/CISACodeGen/CheckInstrTypes.cpp b/IGC/Compiler/CISACodeGen/CheckInstrTypes.cpp
@@ -194,7 +194,7 @@ void CheckInstrTypes::checkGlobalLocal(llvm::Instruction& I)
     BasicBlock* dBB = I.getParent();
 
     for (auto U : I.users()) {
-        auto UI = dyn_cast<Instruction>(U);
+        auto UI = cast<Instruction>(U);
         BasicBlock* uBB = UI->getParent();
         if (uBB != dBB)
         {

diff --git a/IGC/Compiler/CISACodeGen/helper.cpp b/IGC/Compiler/CISACodeGen/helper.cpp
@@ -2686,7 +2686,7 @@ namespace IGC
 
         for (auto UI = ptr->user_begin(), E = ptr->user_end(); UI != E; ++UI)
         {
-            Instruction* inst = dyn_cast<Instruction>(*UI);
+            Instruction* inst = cast<Instruction>(*UI);
             PointerType* instType = nullptr;
             if (isa<BitCastInst>(inst) || isa<GetElementPtrInst>(inst) ||
                 isa<AddrSpaceCastInst>(inst) || isa<PHINode>(inst))

diff --git a/IGC/Compiler/CustomUnsafeOptPass.cpp b/IGC/Compiler/CustomUnsafeOptPass.cpp
@@ -676,7 +676,7 @@ bool CustomUnsafeOptPass::visitBinaryOperatorExtractCommonMultiplier(BinaryOpera
                             previousRoot = currentRoot;
                             if (removeCommonMultiplier(sumComponent, commonMultiplier))
                             {
-                                currentRoot = dyn_cast<Instruction>(*currentRoot->user_begin());
+                                currentRoot = llvm::cast<Instruction>(*currentRoot->user_begin());
                                 sumComponent = llvm::dyn_cast<llvm::Instruction>(currentRoot->getOperand(1));
                                 patternFound = true;
                             }

diff --git a/IGC/Compiler/LegalizationPass.cpp b/IGC/Compiler/LegalizationPass.cpp
@@ -166,7 +166,7 @@ void Legalization::visitInstruction(llvm::Instruction& I)
     BasicBlock* dBB = I.getParent();
 
     for (auto U : I.users()) {
-        auto UI = dyn_cast<Instruction>(U);
+        auto UI = cast<Instruction>(U);
         BasicBlock* uBB = UI->getParent();
         if (uBB != dBB)
         {

diff --git a/.../Optimizer/OpenCLPasses/JointMatrixFuncsResolutionPass/JointMatrixFuncsResolutionPass.cpp b/.../Optimizer/OpenCLPasses/JointMatrixFuncsResolutionPass/JointMatrixFuncsResolutionPass.cpp
@@ -1699,7 +1699,7 @@ Type *JointMatrixFuncsResolutionPass::ResolveArrayType(Type *oldType)
     if (ResolvedTypes.count(oldType) > 0)
         return ResolvedTypes[oldType];
 
-    ArrayType *arrayType = dyn_cast<ArrayType>(oldType);
+    ArrayType *arrayType = cast<ArrayType>(oldType);
     Type *elemType = arrayType->getElementType();
     if (!isOrContainsMatrixType(elemType))
         return oldType;

diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp
@@ -482,7 +482,7 @@ static void sinkAllocaSingleUse(SmallVectorImpl<AllocaInst*>& Allocas) {
         {
             bool Skip = false;
             SmallVector<Instruction*, 8> UInsts;
-            auto UI = dyn_cast<Instruction>(A);
+            auto UI = cast<Instruction>(A);
             // can't sink phi nodes to other BBs
             // can't sink loads since we don't check for stores on the way
             if (isa<PHINode>(UI) || UI->mayReadFromMemory())