[clang] b074f25 - [NFC][Clang] Fix static analyzer concern (#88179)

via cfe-commits cfe-commits at lists.llvm.org
Fri Apr 12 11:41:53 PDT 2024


Author: elizabethandrews
Date: 2024-04-12T14:41:49-04:00
New Revision: b074f25329501487e312b59e463a2d5f743090f8

URL: https://github.com/llvm/llvm-project/commit/b074f25329501487e312b59e463a2d5f743090f8
DIFF: https://github.com/llvm/llvm-project/commit/b074f25329501487e312b59e463a2d5f743090f8.diff

LOG: [NFC][Clang] Fix static analyzer concern (#88179)

Fix static analyzer concerns about dereferencing
null values.

Added: 
    

Modified: 
    clang/lib/AST/Interp/InterpState.h
    clang/lib/Sema/SemaAPINotes.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/AST/Interp/InterpState.h b/clang/lib/AST/Interp/InterpState.h
index 8f84bf6ed2eaff..c17cfad11b1e2b 100644
--- a/clang/lib/AST/Interp/InterpState.h
+++ b/clang/lib/AST/Interp/InterpState.h
@@ -89,7 +89,11 @@ class InterpState final : public State, public SourceMapper {
 
   /// Delegates source mapping to the mapper.
   SourceInfo getSource(const Function *F, CodePtr PC) const override {
-    return M ? M->getSource(F, PC) : F->getSource(PC);
+    if (M)
+      return M->getSource(F, PC);
+
+    assert(F && "Function cannot be null");
+    return F->getSource(PC);
   }
 
   Context &getContext() const { return Ctx; }

diff  --git a/clang/lib/Sema/SemaAPINotes.cpp b/clang/lib/Sema/SemaAPINotes.cpp
index a3128306c664fe..4c445f28bba8c6 100644
--- a/clang/lib/Sema/SemaAPINotes.cpp
+++ b/clang/lib/Sema/SemaAPINotes.cpp
@@ -463,6 +463,8 @@ static void ProcessAPINotes(Sema &S, FunctionOrMethod AnyFunc,
     D = MD;
   }
 
+  assert((FD || MD) && "Expecting Function or ObjCMethod");
+
   // Nullability of return type.
   if (Info.NullabilityAudited)
     applyNullability(S, D, Info.getReturnTypeInfo(), Metadata);


        


More information about the cfe-commits mailing list