tests: don't print SIL types in the SILOptimizer/init_static_globals.sil test

Author: eeckstein

test/SILOptimizer/init_static_globals.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -initialize-static-globals | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -initialize-static-globals | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 
@@ -40,8 +40,8 @@ let nontrivialglobal: TClass
 
 // CHECK-LABEL: sil_global hidden [let] @$trivialglobal : $TStruct = {
 // CHECK:  [[CONST:%.*]] = integer_literal $Builtin.Int32, 10
-// CHECK:  [[INT:%.*]] = struct $Int32 ([[CONST]] : $Builtin.Int32)
-// CHECK:  %initval = struct $TStruct ([[INT]] : $Int32)
+// CHECK:  [[INT:%.*]] = struct $Int32 ([[CONST]])
+// CHECK:  %initval = struct $TStruct ([[INT]])
 sil_global hidden [let] @$trivialglobal : $TStruct
 sil_global private @globalinit_trivialglobal_token : $Builtin.Word
 
@@ -56,9 +56,9 @@ sil_global private @empty_global_token : $Builtin.Word
 
 // CHECK: sil_global @go : $Outer = {
 // CHECK-NEXT:   %0 = integer_literal $Builtin.Int32, 2
-// CHECK-NEXT:   %1 = struct $Int32 (%0 : $Builtin.Int32)
-// CHECK-NEXT:   %2 = struct $TStruct (%1 : $Int32)
-// CHECK-NEXT:   %initval = struct $Outer (%1 : $Int32, %2 : $TStruct, %1 : $Int32)
+// CHECK-NEXT:   %1 = struct $Int32 (%0)
+// CHECK-NEXT:   %2 = struct $TStruct (%1)
+// CHECK-NEXT:   %initval = struct $Outer (%1, %2, %1)
 // CHECK-NEXT: }
 sil_global @go : $Outer
 sil_global private @globalinit_token0 : $Builtin.Word
@@ -81,10 +81,10 @@ sil_global private @g4_token : $Builtin.Word
 
 // CHECK-LABEL: sil_global [let] @g5 : $TwoFields = {
 // CHECK-NEXT:    %0 = integer_literal $Builtin.Int32, 11
-// CHECK-NEXT:    %1 = struct $Int32 (%0 : $Builtin.Int32)
+// CHECK-NEXT:    %1 = struct $Int32 (%0)
 // CHECK-NEXT:    %2 = integer_literal $Builtin.Int32, 10
-// CHECK-NEXT:    %3 = struct $Int32 (%2 : $Builtin.Int32)
-// CHECK-NEXT:    %initval = struct $TwoFields (%1 : $Int32, %3 : $Int32)
+// CHECK-NEXT:    %3 = struct $Int32 (%2)
+// CHECK-NEXT:    %initval = struct $TwoFields (%1, %3)
 // CHECK-NEXT:  }
 sil_global [let] @g5 : $TwoFields
 
@@ -93,8 +93,8 @@ sil_global [let] @g7 : $TwoFields
 
 // CHECK-LABEL: sil_global [let] @g8 : $UnsafePointer<Int32> = {
 // CHECK-NEXT:    %0 = global_addr @g1 : $*Int32
-// CHECK-NEXT:    %1 = address_to_pointer %0 : $*Int32 to $Builtin.RawPointer
-// CHECK-NEXT:    %initval = struct $UnsafePointer<Int32> (%1 : $Builtin.RawPointer)
+// CHECK-NEXT:    %1 = address_to_pointer %0 to $Builtin.RawPointer
+// CHECK-NEXT:    %initval = struct $UnsafePointer<Int32> (%1)
 // CHECK-NEXT:  }
 sil_global [let] @g8 : $UnsafePointer<Int32>
 
@@ -240,10 +240,10 @@ bb0:
 // CHECK-LABEL: sil [global_init_once_fn] [ossa] @merge_stores_but_no_global_init :
 // CHECK:         [[GA:%.*]] = global_addr @g9 : $*TwoFields
 // CHECK:         [[L10:%.*]] = integer_literal $Builtin.Int32, 10
-// CHECK:         [[I10:%.*]] = struct $Int32 ([[L10]] : $Builtin.Int32)
+// CHECK:         [[I10:%.*]] = struct $Int32 ([[L10]])
 // CHECK:         [[L11:%.*]] = integer_literal $Builtin.Int32, 11
-// CHECK:         [[I11:%.*]] = struct $Int32 ([[L11]] : $Builtin.Int32)
-// CHECK:         [[TF:%.*]] = struct $TwoFields ([[I11]] : $Int32, [[I10]] : $Int32)
+// CHECK:         [[I11:%.*]] = struct $Int32 ([[L11]])
+// CHECK:         [[TF:%.*]] = struct $TwoFields ([[I11]], [[I10]])
 // CHECK:         store [[TF]] to [trivial] [[GA]]
 // CHECK:         function_ref
 // CHECK:       } // end sil function 'merge_stores_but_no_global_init'