diff --git a/clang/include/clang/Basic/PlistSupport.h b/clang/include/clang/Basic/PlistSupport.h index 557462a5b90d..f81b469bb87d 100644 --- a/clang/include/clang/Basic/PlistSupport.h +++ b/clang/include/clang/Basic/PlistSupport.h @@ -127,11 +127,7 @@ inline void EmitRange(raw_ostream &o, const SourceManager &SM, assert(R.isCharRange() && "cannot handle a token range"); Indent(o, indent) << "\n"; EmitLocation(o, SM, R.getBegin(), FM, indent + 1); - - // The ".getLocWithOffset(-1)" emulates the behavior of an off-by-one bug - // in Lexer that is already fixed. It is here for backwards compatibility - // even though it is incorrect. - EmitLocation(o, SM, R.getEnd().getLocWithOffset(-1), FM, indent + 1); + EmitLocation(o, SM, R.getEnd(), FM, indent + 1); Indent(o, indent) << "\n"; } diff --git a/clang/include/clang/Lex/Lexer.h b/clang/include/clang/Lex/Lexer.h index 69cfe62e4bdb..4a8a0f6f0d67 100644 --- a/clang/include/clang/Lex/Lexer.h +++ b/clang/include/clang/Lex/Lexer.h @@ -382,7 +382,7 @@ public: SourceLocation End = getLocForEndOfToken(Range.getEnd(), 0, SM, LangOpts); return End.isInvalid() ? CharSourceRange() : CharSourceRange::getCharRange( - Range.getBegin(), End); + Range.getBegin(), End.getLocWithOffset(-1)); } static CharSourceRange getAsCharRange(CharSourceRange Range, const SourceManager &SM, diff --git a/clang/unittests/Lex/LexerTest.cpp b/clang/unittests/Lex/LexerTest.cpp index 7b14f56201eb..320b60ea639a 100644 --- a/clang/unittests/Lex/LexerTest.cpp +++ b/clang/unittests/Lex/LexerTest.cpp @@ -513,23 +513,4 @@ TEST_F(LexerTest, StringizingRasString) { EXPECT_EQ(String6, R"(a\\\n\n\n \\\\b)"); } -TEST_F(LexerTest, CharRangeOffByOne) { - std::vector toks = Lex(R"(#define MOO 1 - void foo() { MOO; })"); - const Token &moo = toks[5]; - - EXPECT_EQ(getSourceText(moo, moo), "MOO"); - - SourceRange R{moo.getLocation(), moo.getLocation()}; - - EXPECT_TRUE( - Lexer::isAtStartOfMacroExpansion(R.getBegin(), SourceMgr, LangOpts)); - EXPECT_TRUE( - Lexer::isAtEndOfMacroExpansion(R.getEnd(), SourceMgr, LangOpts)); - - CharSourceRange CR = Lexer::getAsCharRange(R, SourceMgr, LangOpts); - - EXPECT_EQ(Lexer::getSourceText(CR, SourceMgr, LangOpts), "MOO"); // Was "MO". -} - } // anonymous namespace