Skip to content

Commit a80aad2

Browse files
authored
[YAML] fix output incorrect format for block scalar string (#132897)
After outputting block scalar string, the indent will be wrong. This patch fixes Padding after block scalar string to ensure the correct format of yaml. The new added ut will fail in main. ```diff @@ -3,4 +3,4 @@ Just a block scalar doc -scalar: a + scalar: a ...\n ```
1 parent 6a371c7 commit a80aad2

File tree

6 files changed

+3
-7
lines changed

6 files changed

+3
-7
lines changed

llvm/lib/Support/YAMLTraits.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,18 +725,18 @@ void Output::blockScalarString(StringRef &S) {
725725
if (!StateStack.empty())
726726
newLineCheck();
727727
output(" |");
728-
outputNewLine();
729728

730729
unsigned Indent = StateStack.empty() ? 1 : StateStack.size();
731730

732731
auto Buffer = MemoryBuffer::getMemBuffer(S, "", false);
733732
for (line_iterator Lines(*Buffer, false); !Lines.is_at_end(); ++Lines) {
733+
outputNewLine();
734734
for (unsigned I = 0; I < Indent; ++I) {
735735
output(" ");
736736
}
737737
output(*Lines);
738-
outputNewLine();
739738
}
739+
outputUpToEndOfLine("");
740740
}
741741

742742
void Output::scalarTag(std::string &Tag) {

llvm/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ end:
431431

432432
; CHECK-LABEL: name: unreachable
433433
; CHECK: G_ADD
434-
; CHECK-NEXT: {{^$}}
435434
; CHECK-NEXT: ...
436435
define void @unreachable(i32 %a) {
437436
%sum = add i32 %a, %a

llvm/test/CodeGen/Generic/MIRStripDebug/no-metadata-present.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# CHECK: name: test
44
# CHECK: body: |
55
# CHECK-NEXT: bb.0:
6-
# CHECK-EMPTY:
76
# CHECK-NEXT: ...
87

98
---

llvm/test/CodeGen/MIR/AArch64/empty-MF.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# CHECK-NEXT: ---
44
# CHECK-NEXT: name: foo
55
# CHECK: body: |
6-
# CHECK-EMPTY:
76
# CHECK-NEXT: ...
87
---
98
name: foo

llvm/test/tools/obj2yaml/Minidump/basic.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ Streams:
114114
# CHECK-NEXT: Text: |
115115
# CHECK-NEXT: 400d9000-400db000 r-xp 00000000 b3:04 227 /system/bin/app_process
116116
# CHECK-NEXT: 400db000-400dc000 r--p 00001000 b3:04 227 /system/bin/app_process
117-
# CHECK-EMPTY:
118117
# CHECK-NEXT: - Type: ModuleList
119118
# CHECK-NEXT: Modules:
120119
# CHECK-NEXT: - Base of Image: 0x1020304050607

llvm/unittests/Support/YAMLIOTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ TEST(YAMLIO, TestScalarAfterBlockScalar) {
12981298
- block_scalac: |
12991299
AA
13001300
BB
1301-
scalar: a
1301+
scalar: a
13021302
...
13031303
)");
13041304
}

0 commit comments

Comments
 (0)