From e9a9fc75c6583d03f24654bd66a5f546da60ec34 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Sun, 28 Jan 2024 03:18:39 -0500 Subject: [PATCH] Fixed extra lines after IR blocks --- generator/control-flow_test.go | 10 ---------- generator/misc_test.go | 4 ---- llvm/function.go | 5 +---- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/generator/control-flow_test.go b/generator/control-flow_test.go index 520c03a..0728c24 100644 --- a/generator/control-flow_test.go +++ b/generator/control-flow_test.go @@ -8,14 +8,11 @@ testString (test, 0: %1 = alloca i64 br i1 true, label %2, label %4 - 2: store i64 5, ptr %1 br label %3 - 3: ret void - 4: store i64 6, ptr %1 br label %3 @@ -39,11 +36,9 @@ testString (test, 0: %1 = alloca i64 br i1 true, label %2, label %3 - 2: store i64 5, ptr %1 br label %3 - 3: ret void } @@ -64,15 +59,12 @@ testString (test, 0: %1 = alloca i64 br i1 true, label %2, label %5 - 2: br label %3 - 3: %4 = phi i64 [ 5, %2 ], [ 6, %5 ] store i64 %4, ptr %1 ret void - 5: br label %3 } @@ -89,10 +81,8 @@ testString (test, `define void @main() { 0: br label %1 - 1: br label %1 - 2: ret void } diff --git a/generator/misc_test.go b/generator/misc_test.go index f8bcc12..850b235 100644 --- a/generator/misc_test.go +++ b/generator/misc_test.go @@ -115,16 +115,13 @@ define void @print(%String %string) { store %String %string, ptr %1 %2 = alloca %String br label %3 - 3: %4 = getelementptr { ptr, %Index }, ptr %1, i32 0, i32 1 %5 = load %Index, ptr %4 %6 = icmp ult %Index %5, 1 br i1 %6, label %7, label %8 - 7: br label %21 - 8: %9 = getelementptr { ptr, %Index }, ptr %1, i32 0, i32 0 %10 = load ptr, ptr %9 @@ -142,7 +139,6 @@ define void @print(%String %string) { %20 = load %String, ptr %2 store %String %20, ptr %1 br label %3 - 21: ret void } diff --git a/llvm/function.go b/llvm/function.go index 16258bd..8a8f0b5 100644 --- a/llvm/function.go +++ b/llvm/function.go @@ -109,10 +109,7 @@ func (this *Function) headerString () string { func (this *Function) bodyString () string { buffer := &strings.Builder { } buffer.WriteString("{\n") - for i, block := range this.Blocks { - if i != 0 { - buffer.WriteString("\n") - } + for _, block := range this.Blocks { fmt.Fprintf(buffer, "%s", block.LLString()) } buffer.WriteString("}\n")