revert changes to explicit object member functions

Author: cor3ntin

clang/include/clang/AST/Expr.h

@@ -3227,7 +3227,19 @@ class CallExpr : public Expr {
     return getCallee()->getBeginLoc();
   }
 
-  SourceLocation getEndLoc() const LLVM_READONLY;
+  SourceLocation getEndLoc() const {
+      if(CallExprBits.HasTrailingSourceLoc) {
+          static_assert(sizeof(CallExpr) <= offsetToTrailingObjects + 2 * sizeof(SourceLocation));
+          return *reinterpret_cast<const SourceLocation*>(reinterpret_cast<const char *>(this) +
+                                                          sizeof(CallExpr) + sizeof(SourceLocation));
+      }
+
+    SourceLocation end = getRParenLoc();
+    if (end.isInvalid() && getNumArgs() > 0 && getArg(getNumArgs() - 1))
+      end = getArg(getNumArgs() - 1)->getEndLoc();
+    return end;
+  }
+
 
 private:
   friend class ASTStmtReader;
@@ -3239,8 +3251,8 @@ class CallExpr : public Expr {
       static_assert(sizeof(CallExpr) <= offsetToTrailingObjects + 2 * sizeof(SourceLocation));
       SourceLocation* Locs = reinterpret_cast<SourceLocation*>(reinterpret_cast<char *>(this) +
                                                                sizeof(CallExpr));
-      Locs[0] = getBeginLoc();
-      Locs[1] = getEndLoc();
+      new (Locs) SourceLocation(getBeginLoc());
+      new (Locs+1) SourceLocation(getEndLoc());
       CallExprBits.HasTrailingSourceLoc = true;
   }
 

clang/include/clang/AST/NestedNameSpecifier.h

@@ -283,7 +283,9 @@ class NestedNameSpecifierLoc {
   /// For example, if this instance refers to a nested-name-specifier
   /// \c \::std::vector<int>::, the returned source range would cover
   /// from the initial '::' to the last '::'.
-  SourceRange getSourceRange() const LLVM_READONLY;
+  SourceRange getSourceRange() const LLVM_READONLY {
+    return SourceRange(getBeginLoc(), getEndLoc());
+  }
 
   /// Retrieve the source range covering just the last part of
   /// this nested-name-specifier, not including the prefix.
@@ -296,13 +298,19 @@ class NestedNameSpecifierLoc {
   /// Retrieve the location of the beginning of this
   /// nested-name-specifier.
   SourceLocation getBeginLoc() const {
-    return getSourceRange().getBegin();
+    if (!Qualifier)
+      return SourceLocation();
+
+    NestedNameSpecifierLoc First = *this;
+    while (NestedNameSpecifierLoc Prefix = First.getPrefix())
+      First = Prefix;
+    return First.getLocalSourceRange().getBegin();
   }
 
   /// Retrieve the location of the end of this
   /// nested-name-specifier.
   SourceLocation getEndLoc() const {
-    return getSourceRange().getEnd();
+    return getLocalSourceRange().getEnd();
   }
 
   /// Retrieve the location of the beginning of this

clang/lib/AST/Expr.cpp

@@ -1627,15 +1627,6 @@ CallExpr::getUnusedResultAttr(const ASTContext &Ctx) const {
   return {nullptr, nullptr};
 }
 
-SourceLocation CallExpr::getEndLoc() const {
-  if (const auto *OCE = dyn_cast<CXXOperatorCallExpr>(this))
-    return OCE->getEndLoc();
-
-  SourceLocation end = getRParenLoc();
-  if (end.isInvalid() && getNumArgs() > 0 && getArg(getNumArgs() - 1))
-    end = getArg(getNumArgs() - 1)->getEndLoc();
-  return end;
-}
 
 OffsetOfExpr *OffsetOfExpr::Create(const ASTContext &C, QualType type,
                                    SourceLocation OperatorLoc,

clang/lib/AST/NestedNameSpecifier.cpp

@@ -407,18 +407,6 @@ static void *LoadPointer(void *Data, unsigned Offset) {
   return Result;
 }
 
-SourceRange NestedNameSpecifierLoc::getSourceRange() const {
-  if (!Qualifier)
-    return SourceRange();
-
-  NestedNameSpecifierLoc First = *this;
-  while (NestedNameSpecifierLoc Prefix = First.getPrefix())
-    First = Prefix;
-
-  return SourceRange(First.getLocalSourceRange().getBegin(),
-                     getLocalSourceRange().getEnd());
-}
-
 SourceRange NestedNameSpecifierLoc::getLocalSourceRange() const {
   if (!Qualifier)
     return SourceRange();