Use ASTContext rather than Sema in BoundsAttributedTypeLoc

Author: hnrklssn

clang/include/clang/AST/TypeLoc.h

@@ -19,7 +19,6 @@
 #include "clang/AST/NestedNameSpecifierBase.h"
 #include "clang/AST/TemplateBase.h"
 #include "clang/AST/TypeBase.h"
-#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/Specifiers.h"
@@ -43,7 +42,6 @@ class ObjCInterfaceDecl;
 class ObjCProtocolDecl;
 class ObjCTypeParamDecl;
 class ParmVarDecl;
-class Sema;
 class TemplateTypeParmDecl;
 class UnqualTypeLoc;
 class UnresolvedUsingTypenameDecl;
@@ -1320,8 +1318,8 @@ class BoundsAttributedTypeLoc
   void setAttrRange(SourceRange Range) { getLocalData()->Range = Range; }
   SourceRange getAttrRange() const { return getLocalData()->Range; }
 
-  StringRef getAttrNameAsWritten(Sema &S) const;
-  SourceRange getAttrNameRange(Sema &S) const;
+  StringRef getAttrNameAsWritten(const ASTContext &Ctx) const;
+  SourceRange getAttrNameRange(const ASTContext &Ctx) const;
 
   unsigned getLocalDataSize() const { return sizeof(BoundsAttributedLocInfo); }
 };

clang/lib/Sema/SemaBoundsSafety.cpp

@@ -12,6 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
+#include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/StmtVisitor.h"
@@ -243,25 +244,25 @@ bool Sema::CheckCountedByAttrOnField(FieldDecl *FD, Expr *E, bool CountInBytes,
 
 // FIXME: for some reason diagnostics highlight the end character, while
 // getSourceText() does not include the end character.
-static SourceRange getAttrNameRangeImpl(Sema &S, SourceLocation Begin,
+static SourceRange getAttrNameRangeImpl(const ASTContext &Ctx, SourceLocation Begin,
                                         bool IsForDiagnostics) {
-  SourceManager &SM = S.getSourceManager();
+  const SourceManager &SM = Ctx.getSourceManager();
   SourceLocation TokenStart = Begin;
   while (TokenStart.isMacroID())
     TokenStart = SM.getImmediateExpansionRange(TokenStart).getBegin();
   unsigned Offset = IsForDiagnostics ? 1 : 0;
-  SourceLocation End = S.getLocForEndOfToken(TokenStart, Offset);
+  SourceLocation End = Lexer::getLocForEndOfToken(TokenStart, Offset, SM, Ctx.getLangOpts());
   return {TokenStart, End};
 }
 
-StringRef BoundsAttributedTypeLoc::getAttrNameAsWritten(Sema &S) const {
-  SourceRange Range = getAttrNameRangeImpl(S, getAttrRange().getBegin(), false);
+StringRef BoundsAttributedTypeLoc::getAttrNameAsWritten(const ASTContext &Ctx) const {
+  SourceRange Range = getAttrNameRangeImpl(Ctx, getAttrRange().getBegin(), false);
   CharSourceRange NameRange = CharSourceRange::getCharRange(Range);
-  return Lexer::getSourceText(NameRange, S.getSourceManager(), S.getLangOpts());
+  return Lexer::getSourceText(NameRange, Ctx.getSourceManager(), Ctx.getLangOpts());
 }
 
-SourceRange BoundsAttributedTypeLoc::getAttrNameRange(Sema &S) const {
-  return getAttrNameRangeImpl(S, getAttrRange().getBegin(), true);
+SourceRange BoundsAttributedTypeLoc::getAttrNameRange(const ASTContext &Ctx) const {
+  return getAttrNameRangeImpl(Ctx, getAttrRange().getBegin(), true);
 }
 
 static TypeSourceInfo *getTSI(const Decl *D) {
@@ -333,9 +334,9 @@ static void EmitIncompleteCountedByPointeeNotes(Sema &S,
         << CATy->isOrNull();
     return;
   }
-  SourceRange AttrSrcRange = CATL.getAttrNameRange(S);
+  SourceRange AttrSrcRange = CATL.getAttrNameRange(S.getASTContext());
 
-  StringRef Spelling = CATL.getAttrNameAsWritten(S);
+  StringRef Spelling = CATL.getAttrNameAsWritten(S.getASTContext());
   StringRef FixedSpelling =
       llvm::StringSwitch<StringRef>(Spelling)
           .Case("__counted_by", "__sized_by")