[clang] 2936774 - [Clang][AST][NFC] Add assertion on Init to CompoundLiteralExpr (#152593)

[via cfe-commits]

Author: Shafik Yaghmour
Date: 2025-08-08T15:04:11-07:00
New Revision: 29367747bc81b41d60fb40e48cc5907e3667d914

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

LOG: [Clang][AST][NFC] Add assertion on Init to CompoundLiteralExpr (#152593)

Static analysis complained that:

  child_range(&Init, &Init+1);

in the children member function was potentially out of bounds. This is
false b/c it is forming an iterator range but it would be invalid if
Init was a nullptr.

I add an assertion in the constructor for this and remove to FIXME
checks that are related to this. I checked the various usages and we
always valid the argument is not nullptr.

Added: 
    

Modified: 
    clang/include/clang/AST/Expr.h

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/AST/Expr.h b/clang/include/clang/AST/Expr.h
index 237b3b2cf7444..5653b2549ac3c 100644
--- a/clang/include/clang/AST/Expr.h
+++ b/clang/include/clang/AST/Expr.h
@@ -3548,6 +3548,7 @@ class CompoundLiteralExpr : public Expr {
                       QualType T, ExprValueKind VK, Expr *init, bool fileScope)
       : Expr(CompoundLiteralExprClass, T, VK, OK_Ordinary),
         LParenLoc(lparenloc), TInfoAndScope(tinfo, fileScope), Init(init) {
+    assert(Init && "Init is a nullptr");
     setDependence(computeDependence(this));
   }
 
@@ -3577,19 +3578,11 @@ class CompoundLiteralExpr : public Expr {
   APValue &getStaticValue() const;
 
   SourceLocation getBeginLoc() const LLVM_READONLY {
-    // FIXME: Init should never be null.
-    if (!Init)
-      return SourceLocation();
     if (LParenLoc.isInvalid())
       return Init->getBeginLoc();
     return LParenLoc;
   }
-  SourceLocation getEndLoc() const LLVM_READONLY {
-    // FIXME: Init should never be null.
-    if (!Init)
-      return SourceLocation();
-    return Init->getEndLoc();
-  }
+  SourceLocation getEndLoc() const LLVM_READONLY { return Init->getEndLoc(); }
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == CompoundLiteralExprClass;