Skip to content

[MC,ELF] Emit warning if a string constant contains newline char #98060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 16, 2024
Merged

[MC,ELF] Emit warning if a string constant contains newline char #98060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5ba8182
[MC,ELF] Emit warning if a string constant contains newline char.
chestnykh Jul 8, 2024
9cbe1ce
[MC,ELF] Move warning handling to parser code
chestnykh Jul 9, 2024
8cc91db
[MC,AsmParser] Warn about newlines in some cases
chestnykh Jul 9, 2024
02b6535
[MC,AMDGPU] Correct code format
chestnykh Jul 9, 2024
602019f
[MC,AsmParser] Rework `parseEscapedString`
chestnykh Jul 9, 2024
deeed1d
[MC,AsmParser] Rework test to newline warnings.
chestnykh Jul 9, 2024
c2baa2c
[MC,AsmParser] Adjuct test to newline warnings
chestnykh Jul 9, 2024
b30d756
[MC,AsmParser] Correct code style
chestnykh Jul 9, 2024
b866eff
[MC,AsmParser] Refactor AsmParser.c and the test
chestnykh Jul 10, 2024
3cbfa5f
[MC,AsmParser] Remove unneeded filename from the test
chestnykh Jul 10, 2024
91f2c7f
[MC,AsmParser] Refactor test
chestnykh Jul 10, 2024
b43c4fa
[MC] Use x86_64 as triple in test
chestnykh Jul 15, 2024
60392b7
[MC, ELF] Refactor test
chestnykh Jul 15, 2024
2f517c3
[MC,ELF] Refactor the test
chestnykh Jul 15, 2024
d8cd073
[MC,ELF] Simplify `--implicit-check-not` argument
chestnykh Jul 16, 2024
f1264d4
[MC,ELF] Add missed colon
chestnykh Jul 16, 2024
de4772d
[MC,ELF] Add needed indent
chestnykh Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion llvm/lib/MC/MCParser/AsmLexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ AsmToken AsmLexer::LexQuote() {
return AsmToken(AsmToken::String, StringRef(TokStart, CurPtr - TokStart));
}

// TODO: does gas allow multiline string constants?
while (CurChar != '"') {
if (CurChar == '\\') {
// Allow \", etc.
Expand Down
5 changes: 5 additions & 0 deletions llvm/lib/MC/MCParser/AsmParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3033,6 +3033,11 @@ bool AsmParser::parseEscapedString(std::string &Data) {
StringRef Str = getTok().getStringContents();
for (unsigned i = 0, e = Str.size(); i != e; ++i) {
if (Str[i] != '\\') {
if (Str[i] == '\n') {
SMLoc NewlineLoc = SMLoc::getFromPointer(Str.data() + i);
if (Warning(NewlineLoc, "unterminated string; newline inserted"))
return true;
}
Data += Str[i];
continue;
}
Expand Down
55 changes: 55 additions & 0 deletions llvm/test/MC/ELF/warn-newline-in-escaped-string.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// RUN: llvm-mc -filetype=obj -triple x86_64 %s 2>&1 -o /dev/null \
// RUN: | FileCheck %s --implicit-check-not=warning:

.string "abcd\xFFefg
12345678"

// CHECK: [[#@LINE-3]]:21: warning: unterminated string; newline inserted
// CHECK-NEXT: .string "abcd\xFFefg

.ascii "some test ascii

sequence
with
newlines\x0A
"

// CHECK: [[#@LINE-7]]:24: warning: unterminated string; newline inserted
// CHECK-NEXT: .ascii "some test ascii
// CHECK: [[#@LINE-8]]:1: warning: unterminated string; newline inserted
// CHECK: [[#@LINE-8]]:9: warning: unterminated string; newline inserted
// CHECK-NEXT: sequence
// CHECK: [[#@LINE-9]]:5: warning: unterminated string; newline inserted
// CHECK-NEXT: with
// CHECK: [[#@LINE-10]]:13: warning: unterminated string; newline inserted
// CHECK-NEXT: newlines\x0A

.asciz "another test string

with
newline characters


"

// CHECK: [[#@LINE-8]]:28: warning: unterminated string; newline inserted
// CHECK-NEXT: .asciz "another test string
// CHECK: [[#@LINE-9]]:1: warning: unterminated string; newline inserted
// CHECK: [[#@LINE-9]]:5: warning: unterminated string; newline inserted
// CHECK-NEXT: with
// CHECK: [[#@LINE-10]]:19: warning: unterminated string; newline inserted
// CHECK-NEXT: newline characters
// CHECK: [[#@LINE-11]]:1: warning: unterminated string; newline inserted
// CHECK: [[#@LINE-11]]:1: warning: unterminated string; newline inserted

.file "warn-newline
.s"
// CHECK: [[#@LINE-2]]:20: warning: unterminated string; newline inserted

.cv_file 1 "some_an
other_file.s"
// CHECK: [[#@LINE-2]]:20: warning: unterminated string; newline inserted

.ascii "test\nvalid1_string\xFF\n\n\xFF"
.asciz "\n\n\nvalid2_string\x0A"
.string "1234\nvalid3_string\xFF\n\xFF\n"