diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2013-08-21 18:57:51 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2013-08-21 18:57:51 +0000 |
| commit | c3d9da2a591b1f6529784ec246b9e0b44dcb704a (patch) | |
| tree | 8a4573f811bed35de3be92668ed48e156c0a6e7d /lib/Lex/LiteralSupport.cpp | |
| parent | 8677ccd659c5f997ae9c4758f8e9aac2ae7f4a14 (diff) | |
| download | clang-c3d9da2a591b1f6529784ec246b9e0b44dcb704a.tar.gz clang-c3d9da2a591b1f6529784ec246b9e0b44dcb704a.tar.bz2 clang-c3d9da2a591b1f6529784ec246b9e0b44dcb704a.tar.xz | |
Revert r188863 which could propose wrong fixits for multibyte character literals.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188918 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/LiteralSupport.cpp')
| -rw-r--r-- | lib/Lex/LiteralSupport.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/Lex/LiteralSupport.cpp b/lib/Lex/LiteralSupport.cpp index 2301aaed82..08d6c438d3 100644 --- a/lib/Lex/LiteralSupport.cpp +++ b/lib/Lex/LiteralSupport.cpp @@ -978,7 +978,7 @@ CharLiteralParser::CharLiteralParser(const char *begin, const char *end, uint32_t largest_character_for_kind; if (tok::wide_char_constant == Kind) { largest_character_for_kind = - 0xFFFFFFFFu >> (32 - PP.getTargetInfo().getWCharWidth()); + 0xFFFFFFFFu >> (32-PP.getTargetInfo().getWCharWidth()); } else if (tok::utf16_char_constant == Kind) { largest_character_for_kind = 0xFFFF; } else if (tok::utf32_char_constant == Kind) { @@ -1009,13 +1009,7 @@ CharLiteralParser::CharLiteralParser(const char *begin, const char *end, unsigned Msg = diag::err_bad_character_encoding; if (NoErrorOnBadEncoding) Msg = diag::warn_bad_character_encoding; - std::string escaped = llvm::utohexstr(static_cast<uint8_t>(*start)); - FullSourceLoc SourceLoc(Loc, PP.getSourceManager()); - PP.Diag(Loc, Msg) << FixItHint::CreateReplacement( - MakeCharSourceRange(PP.getLangOpts(), - SourceLoc, TokBegin, start, - start + 1), - "\\x" + escaped); + PP.Diag(Loc, Msg); if (NoErrorOnBadEncoding) { start = tmp_in_start; buffer_begin = tmp_out_start; @@ -1053,7 +1047,7 @@ CharLiteralParser::CharLiteralParser(const char *begin, const char *end, unsigned CharWidth = getCharWidth(Kind, PP.getTargetInfo()); uint64_t result = ProcessCharEscape(TokBegin, begin, end, HadError, - FullSourceLoc(Loc, PP.getSourceManager()), + FullSourceLoc(Loc,PP.getSourceManager()), CharWidth, &PP.getDiagnostics(), PP.getLangOpts()); *buffer_begin++ = result; } |