[llvm] r373898 - Revert r373888 "[IA] Recognize hexadecimal escape sequences"
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 7 04:46:27 PDT 2019
Author: nico
Date: Mon Oct 7 04:46:26 2019
New Revision: 373898
URL: http://llvm.org/viewvc/llvm-project?rev=373898&view=rev
Log:
Revert r373888 "[IA] Recognize hexadecimal escape sequences"
It broke MC/AsmParser/directive_ascii.s on all bots:
Assertion failed: (Index < Length && "Invalid index!"), function operator[],
file ../../llvm/include/llvm/ADT/StringRef.h, line 243.
Modified:
llvm/trunk/lib/MC/MCParser/AsmParser.cpp
llvm/trunk/test/MC/AsmParser/directive_ascii.s
Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=373898&r1=373897&r2=373898&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Mon Oct 7 04:46:26 2019
@@ -2914,26 +2914,11 @@ bool AsmParser::parseEscapedString(std::
}
// Recognize escaped characters. Note that this escape semantics currently
- // loosely follows Darwin 'as'.
+ // loosely follows Darwin 'as'. Notably, it doesn't support hex escapes.
++i;
if (i == e)
return TokError("unexpected backslash at end of string");
- // Recognize hex sequences similarly to GNU 'as'.
- if (Str[i] == 'x' || Str[i] == 'X') {
- if (!isHexDigit(Str[i + 1]))
- return TokError("invalid hexadecimal escape sequence");
-
- // Consume hex characters. GNU 'as' reads all hexadecimal characters and
- // then truncates to the lower 16 bits. Seems reasonable.
- unsigned Value = 0;
- while (isHexDigit(Str[i + 1]))
- Value = Value * 16 + hexDigitValue(Str[++i]);
-
- Data += (unsigned char)(Value & 0xFF);
- continue;
- }
-
// Recognize octal sequences.
if ((unsigned)(Str[i] - '0') <= 7) {
// Consume up to three octal characters.
Modified: llvm/trunk/test/MC/AsmParser/directive_ascii.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/directive_ascii.s?rev=373898&r1=373897&r2=373898&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/directive_ascii.s (original)
+++ llvm/trunk/test/MC/AsmParser/directive_ascii.s Mon Oct 7 04:46:26 2019
@@ -39,8 +39,3 @@ TEST5:
# CHECK: .byte 0
TEST6:
.string "B", "C"
-
-# CHECK: TEST7:
-# CHECK: .ascii "dk"
-TEST7:
- .ascii "\x64\Xa6B"
More information about the llvm-commits
mailing list