make SM::getColumnNumber take a predecomposed FileID/offset, which
makes it clear to clients that they have to pick an instantiation
or spelling location before calling it and allows optimization based
on that.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63698 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index dd76f78..340c2e5 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -481,14 +481,9 @@
/// returns zero if the column number isn't known. This may only be called on
/// a file sloc, so you must choose a spelling or instantiation location
/// before calling this method.
- unsigned getColumnNumber(SourceLocation Loc) const;
-
- unsigned getSpellingColumnNumber(SourceLocation Loc) const {
- return getColumnNumber(getSpellingLoc(Loc));
- }
- unsigned getInstantiationColumnNumber(SourceLocation Loc) const {
- return getColumnNumber(getInstantiationLoc(Loc));
- }
+ unsigned getColumnNumber(FileID FID, unsigned FilePos) const;
+ unsigned getSpellingColumnNumber(SourceLocation Loc) const;
+ unsigned getInstantiationColumnNumber(SourceLocation Loc) const;
/// getLineNumber - Given a SourceLocation, return the spelling line number