Address aaron's feedback

Author: cor3ntin

clang/include/clang/AST/Expr.h

@@ -2919,19 +2919,19 @@ class CallExpr : public Expr {
   // A bit in CallExprBitfields indicates if source locations are presents.
 
 protected:
-  static constexpr unsigned offsetToTrailingObjects = 32;
+  static constexpr unsigned OffsetToTrailingObjects = 32;
   template <typename T>
   static constexpr unsigned
   sizeToAllocateForCallExprSubclass(unsigned SizeOfTrailingObjects) {
-    static_assert(sizeof(T) <= CallExpr::offsetToTrailingObjects);
-    return SizeOfTrailingObjects + CallExpr::offsetToTrailingObjects;
+    static_assert(sizeof(T) <= CallExpr::OffsetToTrailingObjects);
+    return SizeOfTrailingObjects + CallExpr::OffsetToTrailingObjects;
   }
 
 private:
   /// Return a pointer to the start of the trailing array of "Stmt *".
   Stmt **getTrailingStmts() {
     return reinterpret_cast<Stmt **>(reinterpret_cast<char *>(this) +
-                                     offsetToTrailingObjects);
+                                     OffsetToTrailingObjects);
   }
   Stmt *const *getTrailingStmts() const {
     return const_cast<CallExpr *>(this)->getTrailingStmts();
@@ -2943,7 +2943,7 @@ class CallExpr : public Expr {
 
   size_t getOffsetOfTrailingFPFeatures() const {
     assert(hasStoredFPFeatures());
-    return offsetToTrailingObjects + getSizeOfTrailingStmts();
+    return OffsetToTrailingObjects + getSizeOfTrailingStmts();
   }
 
 public:
@@ -2990,13 +2990,13 @@ class CallExpr : public Expr {
   FPOptionsOverride *getTrailingFPFeatures() {
     assert(hasStoredFPFeatures());
     return reinterpret_cast<FPOptionsOverride *>(
-        reinterpret_cast<char *>(this) + offsetToTrailingObjects +
+        reinterpret_cast<char *>(this) + OffsetToTrailingObjects +
         getSizeOfTrailingStmts());
   }
   const FPOptionsOverride *getTrailingFPFeatures() const {
     assert(hasStoredFPFeatures());
     return reinterpret_cast<const FPOptionsOverride *>(
-        reinterpret_cast<const char *>(this) + offsetToTrailingObjects +
+        reinterpret_cast<const char *>(this) + OffsetToTrailingObjects +
         getSizeOfTrailingStmts());
   }
 
@@ -3217,11 +3217,11 @@ 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) + sizeof(CallExpr));
+      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()) {
@@ -3232,9 +3232,7 @@ class CallExpr : public Expr {
     return getCallee()->getBeginLoc();
   }
 
-  SourceLocation getEndLoc() const {
-    return getRParenLoc();
-  }
+  SourceLocation getEndLoc() const { return getRParenLoc(); }
 
 private:
   friend class ASTStmtReader;
@@ -3248,10 +3246,10 @@ class CallExpr : public Expr {
     assert(getStmtClass() == CallExprClass &&
            "Calling setTrailingSourceLocs on a subclass of CallExpr");
     static_assert(sizeof(CallExpr) <=
-                  offsetToTrailingObjects + 2 * sizeof(SourceLocation));
+                  OffsetToTrailingObjects + sizeof(SourceLocation));
 
-    SourceLocation *Locs = reinterpret_cast<SourceLocation *>(
-        reinterpret_cast<char *>(this) + sizeof(CallExpr));
+    SourceLocation *Locs =
+        reinterpret_cast<SourceLocation *>(reinterpret_cast<char *>(this + 1));
     new (Locs) SourceLocation(getBeginLoc());
     CallExprBits.HasTrailingSourceLoc = true;
   }

clang/lib/AST/Expr.cpp

@@ -1476,7 +1476,7 @@ CallExpr::CallExpr(StmtClass SC, Expr *Fn, ArrayRef<Expr *> PreArgs,
   unsigned NumPreArgs = PreArgs.size();
   CallExprBits.NumPreArgs = NumPreArgs;
   assert((NumPreArgs == getNumPreArgs()) && "NumPreArgs overflow!");
-  assert(SizeOfCallExprInstance(SC) <= offsetToTrailingObjects &&
+  assert(SizeOfCallExprInstance(SC) <= OffsetToTrailingObjects &&
          "This CallExpr subclass is too big or unsupported");
 
   CallExprBits.UsesADL = static_cast<bool>(UsesADL);
@@ -1544,7 +1544,7 @@ Decl *Expr::getReferencedDeclOfCallee() {
 
   // Optimize for the common case first
   // (simple function or member function call)
-  // then try more exotic possibilities
+  // then try more exotic possibilities.
   Expr *CEE = IgnoreImpCasts();
 
   if (auto *DRE = dyn_cast<DeclRefExpr>(CEE))