This is an archive of the discontinued LLVM Phabricator instance.

Differential D99609

[AsmParser] Recognize more escaped characters between single quotes
ClosedPublic

Authored by LemonBoy on Mar 30 2021, 10:12 AM.

Details

Reviewers
thakis
MaskRay
Commits
rGedb18ea5a913: [AsmParser] Recognize more escaped characters between single quotes
Summary

The GNU AS manual states the following about single-character constants enclosed within single quotes:

Some backslash escapes apply to characters, \b, \f, \n, \r, \t, and \" with the same meaning as for strings, plus \' for a single quote.

Add two more characters to the switch handling this case to match GAS behaviour, plus a test to make sure nothing regresses.

Diff Detail

Event Timeline

LemonBoy created this revision.Mar 30 2021, 10:12 AM
Herald added a subscriber: hiraditya. · View Herald TranscriptMar 30 2021, 10:12 AM
LemonBoy requested review of this revision.Mar 30 2021, 10:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 30 2021, 10:12 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
LemonBoy added a reviewer: thakis.Mar 30 2021, 10:22 AM
Harbormaster completed remote builds in B96363: Diff 334209.Mar 30 2021, 11:35 AM
LemonBoy added a reviewer: MaskRay.Apr 7 2021, 11:54 AM
MaskRay accepted this revision.Apr 7 2021, 12:01 PM

LGTM.

llvm/test/MC/AsmParser/directive_values.s
55–56

Consider CHECK-NEXT:. We want to make sure the parser consumes newlines correctly and does not insert extra newlines.

This revision is now accepted and ready to land.Apr 7 2021, 12:01 PM
LemonBoy updated this revision to Diff 336024.Apr 8 2021, 12:56 AM

Use CHECK-NEXT in more places.

This revision was landed with ongoing or failed builds.Apr 8 2021, 12:59 AM
Closed by commit rGedb18ea5a913: [AsmParser] Recognize more escaped characters between single quotes (authored by LemonBoy). · Explain Why
This revision was automatically updated to reflect the committed changes.
LemonBoy added a commit: rGedb18ea5a913: [AsmParser] Recognize more escaped characters between single quotes.
Harbormaster completed remote builds in B97667: Diff 336024.Apr 8 2021, 1:40 AM
c-rhodes mentioned this in D94887: MC: fix AsmLexer not understanding some escapes (notably '\r' and '\f').Sep 9 2021, 6:17 AM

Revision Contents

PathSize
llvm/
lib/
MC/
MCParser/
2 lines
test/
MC/
AsmParser/
58 lines

Diff 336025

llvm/lib/MC/MCParser/AsmLexer.cpp

Show First 20 Lines • Show All 591 Lines • ▼ Show 20 LinesAsmToken AsmLexer::LexSingleQuote() {
if (Res.startswith("\'\\")) { if (Res.startswith("\'\\")) {
char theChar = Res[2]; char theChar = Res[2];
switch (theChar) { switch (theChar) {
default: Value = theChar; break; default: Value = theChar; break;
case '\'': Value = '\''; break; case '\'': Value = '\''; break;
case 't': Value = '\t'; break; case 't': Value = '\t'; break;
case 'n': Value = '\n'; break; case 'n': Value = '\n'; break;
case 'b': Value = '\b'; break; case 'b': Value = '\b'; break;
case 'f': Value = '\f'; break;
case 'r': Value = '\r'; break;
} }
} else } else
Value = TokStart[1]; Value = TokStart[1];
return AsmToken(AsmToken::Integer, Res, Value); return AsmToken(AsmToken::Integer, Res, Value);
} }
/// LexQuote: String: "..." /// LexQuote: String: "..."
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines

llvm/test/MC/AsmParser/directive_values.s

# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s # RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
# CHECK: TEST0: # CHECK: TEST0:
# CHECK: .byte 0 # CHECK-NEXT: .byte 0
TEST0: TEST0:
.byte 0 .byte 0
# CHECK: TEST1: # CHECK: TEST1:
# CHECK: .short 3 # CHECK-NEXT: .short 3
TEST1: TEST1:
.short 3 .short 3
# CHECK: TEST2: # CHECK: TEST2:
# CHECK: .long 8 # CHECK-NEXT: .long 8
TEST2: TEST2:
.long 8 .long 8
# CHECK: TEST3: # CHECK: TEST3:
# CHECK: .quad 9 # CHECK-NEXT: .quad 9
TEST3: TEST3:
.quad 9 .quad 9
# rdar://7997827 # rdar://7997827
TEST4: TEST4:
.quad 0b0100 .quad 0b0100
.quad 4294967295 .quad 4294967295
.quad 4294967295+1 .quad 4294967295+1
.quad 4294967295LL+1 .quad 4294967295LL+1
.quad 0b10LL + 07ULL + 0x42AULL .quad 0b10LL + 07ULL + 0x42AULL
# CHECK: TEST4 # CHECK: TEST4
# CHECK: .quad 4 # CHECK-NEXT: .quad 4
# CHECK: .quad 4294967295 # CHECK-NEXT: .quad 4294967295
# CHECK: .quad 4294967296 # CHECK-NEXT: .quad 4294967296
# CHECK: .quad 4294967296 # CHECK-NEXT: .quad 4294967296
# CHECK: .quad 1075 # CHECK-NEXT: .quad 1075
TEST5: TEST5:
.value 8 .value 8
# CHECK: TEST5: # CHECK: TEST5:
# CHECK: .short 8 # CHECK-NEXT: .short 8
TEST6: TEST6:
.byte 'c' .byte 'c'
.byte '\'' .byte '\''
.byte '\\' .byte '\\'
.byte '\#' .byte '\#'
.byte '\t' .byte '\t'
.byte '\n' .byte '\n'
.byte '\r'
.byte '\f'
.byte '\"'
# CHECK: TEST6 # CHECK: TEST6
# CHECK: .byte 99 # CHECK-NEXT: .byte 99
MaskRayUnsubmitted
Not Done
ReplyInline Actions

Consider CHECK-NEXT:. We want to make sure the parser consumes newlines correctly and does not insert extra newlines.

MaskRay: Consider `CHECK-NEXT:`. We want to make sure the parser consumes newlines correctly and does…
# CHECK: .byte 39 # CHECK-NEXT: .byte 39
# CHECK: .byte 92 # CHECK-NEXT: .byte 92
# CHECK: .byte 35 # CHECK-NEXT: .byte 35
# CHECK: .byte 9 # CHECK-NEXT: .byte 9
# CHECK: .byte 10 # CHECK-NEXT: .byte 10
# CHECK-NEXT: .byte 13
# CHECK-NEXT: .byte 12
# CHECK-NEXT: .byte 34
TEST7: TEST7:
.byte 1, 2, 3, 4 .byte 1, 2, 3, 4
# CHECK: .byte 1 # CHECK: TEST7
# CHECK-NEXT: .byte 1
# CHECK-NEXT: .byte 2 # CHECK-NEXT: .byte 2
# CHECK-NEXT: .byte 3 # CHECK-NEXT: .byte 3
# CHECK-NEXT: .byte 4 # CHECK-NEXT: .byte 4
TEST8: TEST8:
.long 0x200000UL+1 .long 0x200000UL+1
.long 0x200000L+1 .long 0x200000L+1
# CHECK: .long 2097153 # CHECK: TEST8
# CHECK: .long 2097153 # CHECK-NEXT: .long 2097153
# CHECK-NEXT: .long 2097153
TEST9: TEST9:
.octa 0x1234567812345678abcdef, 340282366920938463463374607431768211455 .octa 0x1234567812345678abcdef, 340282366920938463463374607431768211455
.octa 0b00111010010110100101101001011010010110100101101001011010010110100101101001011010010110100101101001011010010110100101101001011010 .octa 0b00111010010110100101101001011010010110100101101001011010010110100101101001011010010110100101101001011010010110100101101001011010
# CHECK: TEST9 # CHECK: TEST9
# CHECK: .quad 8652035380128501231 # CHECK-NEXT: .quad 8652035380128501231
# CHECK: .quad 1193046 # CHECK-NEXT: .quad 1193046
# CHECK: .quad -1 # CHECK-NEXT: .quad -1
# CHECK: .quad -1 # CHECK-NEXT: .quad -1
# CHECK: .quad 6510615555426900570 # CHECK-NEXT: .quad 6510615555426900570
# CHECK: .quad 4204772546213206618 # CHECK-NEXT: .quad 4204772546213206618