Skip to content
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

Jump to bottom

SILPrinter: don't print operand types in static initializers of globals #77805

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SILPrinter: don't print operand types in static initializers of globals #77805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion lib/SIL/IR/SILPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,10 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
/*needPrintType=*/true};
}

void markBlockAsPrinted(const SILBasicBlock *block) {
printedBlocks.insert(block);
}

//===--------------------------------------------------------------------===//
// Big entrypoints.
void print(const SILFunction *F) {
Expand Down Expand Up @@ -932,7 +936,7 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
#endif

void print(const SILBasicBlock *BB) {
printedBlocks.insert(BB);
markBlockAsPrinted(BB);

// Output uses for BB arguments. These are put into place as comments before
// the block header.
Expand Down Expand Up @@ -3677,6 +3681,7 @@ void SILGlobalVariable::print(llvm::raw_ostream &OS, bool Verbose) const {
{
SILPrintContext Ctx(OS);
SILPrinter Printer(Ctx);
Printer.markBlockAsPrinted(&StaticInitializerBlock);
for (const SILInstruction &I : StaticInitializerBlock) {
Printer.print(&I);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Concurrency/global_function_pointer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -enable-experimental-feature SymbolLinkageMarkers -emit-sil -target %target-swift-5.1-abi-triple -parse-as-library %s | %FileCheck %s --check-prefix=CHECK-SIL
// RUN: %target-swift-frontend -enable-experimental-feature SymbolLinkageMarkers -Xllvm -sil-print-types -emit-sil -target %target-swift-5.1-abi-triple -parse-as-library %s | %FileCheck %s --check-prefix=CHECK-SIL
// RUN: %target-build-swift -enable-experimental-feature SymbolLinkageMarkers -target %target-swift-5.1-abi-triple -Xfrontend -parse-as-library %s -o %t_binary
// RUN: %target-codesign %t_binary
// RUN: %target-run %t_binary | %FileCheck %s --check-prefix=CHECK-EXEC
Expand Down
14 changes: 14 additions & 0 deletions test/SIL/Parser/pure_mode.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ import SwiftShims

sil_global hidden @$s3nix2ggSSvp : $String

class C {
@_hasStorage var a: Builtin.Int64
@_hasStorage var b: Builtin.Int64
}

sil_global [let] @gc : $C = {
%0 = integer_literal $Builtin.Int64, 0
%1 = integer_literal $Builtin.Int64, 1
%2 = integer_literal $Builtin.Int64, 2
%3 = integer_literal $Builtin.Int64, 3
// CHECK: %initval = object $C (%0, %1, [tail_elems] %2, %3)
%initval = object $C (%0, %1, [tail_elems] %2, %3)
}

sil @main : $@convention(c) (Int32, UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>) -> Int32 {
[%1: noescape **]
[global: read,write,copy,deinit_barrier]
Expand Down
2 changes: 1 addition & 1 deletion test/SIL/Parser/static_initializer.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-sil-opt %s | %FileCheck %s
// RUN: %target-sil-opt -sil-print-types %s | %FileCheck %s

// Generated from
// var x : Int32 = 2
Expand Down
2 changes: 1 addition & 1 deletion test/SIL/Serialization/globals.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend %s -Xllvm -sil-disable-pass=simplification -emit-module -o %t/tmp.swiftmodule
// RUN: %target-sil-opt %t/tmp.swiftmodule | %FileCheck %s
// RUN: %target-sil-opt -sil-print-types %t/tmp.swiftmodule | %FileCheck %s

sil_stage canonical

Expand Down
2 changes: 1 addition & 1 deletion test/SILOptimizer/global-functionptr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

// Second test (bonus): check if the optimization is done: statically initialize the array of function pointers.

// RUN: %target-build-swift -O -wmo -parse-as-library -module-name=Test %s -emit-sil | %FileCheck %s -check-prefix=CHECK-SIL
// RUN: %target-build-swift -O -wmo -parse-as-library -module-name=Test %s -Xllvm -sil-print-types -emit-sil | %FileCheck %s -check-prefix=CHECK-SIL

// REQUIRES: executable_test
// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
Expand Down
4 changes: 2 additions & 2 deletions test/SILOptimizer/globalopt_resilience_testing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %target-swift-frontend -emit-sil -O -enable-library-evolution -primary-file %s | %FileCheck %s
// RUN: %target-swift-frontend -emit-sil -O -enable-library-evolution -enable-testing -primary-file %s | %FileCheck %s --check-prefix=CHECK-TESTING
// RUN: %target-swift-frontend -Xllvm -sil-print-types -emit-sil -O -enable-library-evolution -primary-file %s | %FileCheck %s
// RUN: %target-swift-frontend -Xllvm -sil-print-types -emit-sil -O -enable-library-evolution -enable-testing -primary-file %s | %FileCheck %s --check-prefix=CHECK-TESTING

// REQUIRES: swift_in_compiler

Expand Down
4 changes: 2 additions & 2 deletions test/SILOptimizer/optionset.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %target-swift-frontend -parse-as-library -primary-file %s -O -sil-verify-all -module-name=test -emit-sil | grep -v debug_value | %FileCheck %s
// RUN: %target-swift-frontend -parse-as-library -primary-file %s -Osize -sil-verify-all -module-name=test -emit-sil | grep -v debug_value | %FileCheck %s
// RUN: %target-swift-frontend -parse-as-library -primary-file %s -O -sil-verify-all -module-name=test -Xllvm -sil-print-types -emit-sil | grep -v debug_value | %FileCheck %s
// RUN: %target-swift-frontend -parse-as-library -primary-file %s -Osize -sil-verify-all -module-name=test -Xllvm -sil-print-types -emit-sil | grep -v debug_value | %FileCheck %s
// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
// REQUIRES: swift_in_compiler

Expand Down