[SYCL][NFC] Fix Static Analyzer bugs (intel#14349)

This patch fixes two possible null pointer dereferences issues: 1. In CodeGenModule::Release(): Dereferencing a pointer that might be nullptr RD->getAttr() when calling getAspectsMD(). 2. In Sema::ActOnFinishFunctionBody(): Passing null pointer FD to hasAttr, which dereferences it. Signed-off-by: Soumi Manna <[email protected]> --------- Signed-off-by: Soumi Manna <[email protected]>
reble · Jul 1, 2024 · 2ac6184 · 2ac6184
1 parent bdd9437
commit 2ac6184
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1380,9 +1380,9 @@ void CodeGenModule::Release() {
       for (const auto &Type : TypesWithAspects) {
         StringRef Name = Type.first;
         const RecordDecl *RD = Type.second;
-        AspectsMD->addOperand(getAspectsMD(Context, TheModule.getContext(),
-                                           Name,
-                                           RD->getAttr<SYCLUsesAspectsAttr>()));
+        if (const auto *Attr = RD->getAttr<SYCLUsesAspectsAttr>())
+          AspectsMD->addOperand(
+              getAspectsMD(Context, TheModule.getContext(), Name, Attr));
       }
     }
 

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
@@ -16542,16 +16542,19 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body,
     DiscardCleanupsInEvaluationContext();
   }
 
-  if (FD && ((LangOpts.OpenMP && (LangOpts.OpenMPIsTargetDevice ||
-                                  !LangOpts.OMPTargetTriples.empty())) ||
-             LangOpts.CUDA || LangOpts.SYCLIsDevice)) {
+  if (!FD)
+    return dcl;
+
+  if ((LangOpts.OpenMP &&
+       (LangOpts.OpenMPIsTargetDevice || !LangOpts.OMPTargetTriples.empty())) ||
+      LangOpts.CUDA || LangOpts.SYCLIsDevice) {
     auto ES = getEmissionStatus(FD);
     if (ES == Sema::FunctionEmissionStatus::Emitted ||
         ES == Sema::FunctionEmissionStatus::Unknown)
       DeclsToCheckForDeferredDiags.insert(FD);
   }
 
-  if (FD && !FD->isDeleted())
+  if (!FD->isDeleted())
     checkTypeSupport(FD->getType(), FD->getLocation(), FD);
 
   // Handle free functions.