Address more feedback

Author: cor3ntin

clang/include/clang/AST/Expr.h

@@ -2916,7 +2916,7 @@ class CallExpr : public Expr {
   // The layourt is as follow:
   // CallExpr | Begin | 4 bytes left | Trailing Objects
   // CXXMemberCallExpr | Trailing Objects
-  // A bit in CallExprBitfields indicates if source locations are presents.
+  // A bit in CallExprBitfields indicates if source locations are present.
 
 protected:
   static constexpr unsigned OffsetToTrailingObjects = 32;
@@ -3031,7 +3031,7 @@ class CallExpr : public Expr {
 
   Expr *getCallee() { return cast<Expr>(getTrailingStmts()[FN]); }
   const Expr *getCallee() const { return cast<Expr>(getTrailingStmts()[FN]); }
-  void setCallee(Expr *F) { getTrailingStmts()[FN] = F; }
+  void setCallee(Expr *F) { getTrailingStmts()[FN] = F;}
 
   ADLCallKind getADLCallKind() const {
     return static_cast<ADLCallKind>(CallExprBits.UsesADL);
@@ -3217,19 +3217,21 @@ class CallExpr : public Expr {
 
   SourceLocation getBeginLoc() const {
     if (CallExprBits.HasTrailingSourceLoc) {
-      assert(CallExprBits.HasTrailingSourceLoc && "No trailing source loc");
       static_assert(sizeof(CallExpr) <=
                     OffsetToTrailingObjects + sizeof(SourceLocation));
       return *reinterpret_cast<const SourceLocation *>(
           reinterpret_cast<const char *>(this + 1));
     }
 
-    if (usesMemberSyntax()) {
-      if (auto FirstArgLoc = getArg(0)->getBeginLoc(); FirstArgLoc.isValid()) {
+    if (usesMemberSyntax())
+      if (auto FirstArgLoc = getArg(0)->getBeginLoc(); FirstArgLoc.isValid())
         return FirstArgLoc;
-      }
-    }
-    return getCallee()->getBeginLoc();
+
+    // FIXME: Some builtins have no callee begin location
+    SourceLocation begin = getCallee()->getBeginLoc();
+    if (begin.isInvalid() && getNumArgs() > 0 && getArg(0))
+        begin = getArg(0)->getBeginLoc();
+    return begin;
   }
 
   SourceLocation getEndLoc() const { return getRParenLoc(); }

clang/include/clang/AST/Stmt.h

@@ -566,7 +566,7 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     unsigned IsCoroElideSafe : 1;
 
-    /// Tracks When CallExpr is used to represent an explicit object
+    /// Tracks when CallExpr is used to represent an explicit object
     /// member function, in order to adjust the begin location.
     LLVM_PREFERRED_TYPE(bool)
     unsigned ExplicitObjectMemFunUsingMemberSyntax : 1;

clang/lib/AST/Expr.cpp

@@ -1449,7 +1449,7 @@ OverloadedOperatorKind UnaryOperator::getOverloadedOperator(Opcode Opc) {
 //===----------------------------------------------------------------------===//
 // Postfix Operators.
 //===----------------------------------------------------------------------===//
-
+#ifndef NDEBUG
 static unsigned SizeOfCallExprInstance(Expr::StmtClass SC) {
   switch (SC) {
   case Expr::CallExprClass:
@@ -1466,6 +1466,7 @@ static unsigned SizeOfCallExprInstance(Expr::StmtClass SC) {
     llvm_unreachable("unexpected class deriving from CallExpr!");
   }
 }
+#endif
 
 CallExpr::CallExpr(StmtClass SC, Expr *Fn, ArrayRef<Expr *> PreArgs,
                    ArrayRef<Expr *> Args, QualType Ty, ExprValueKind VK,