Update tests based on review feedback.

Author: jckarter

test/SILGen/initializers.swift

@@ -369,6 +369,7 @@ class FailableBaseClass {
   // CHECK:   br bb2([[RESULT]] : $Optional<FailableBaseClass>)
   // CHECK: bb2([[RESULT:%.*]] : @owned $Optional<FailableBaseClass>):
   // CHECK:   return [[RESULT]]
+  // CHECK-NEXT: }
   convenience init?(failAfterDelegation: ()) {
     self.init(noFail: ())
     return nil
@@ -429,6 +430,7 @@ class FailableBaseClass {
   //
   // CHECK: [[EPILOG_BB]]([[WRAPPED_RESULT:%.*]] : @owned $Optional<FailableBaseClass>):
   // CHECK:   return [[WRAPPED_RESULT]]
+  // CHECK-NEXT: }
   convenience init!(failDuringDelegation2: ()) {
     self.init(failBeforeFullInitialization: ())! // unnecessary-but-correct '!'
   }

test/SILGen/objc_factory_init.swift

@@ -38,6 +38,7 @@ extension Hive {
   //
   // CHECK: [[SOME_BB]]([[NEW_HIVE:%.*]] : @owned $Hive):
   // CHECK:   assign [[NEW_HIVE]] to [[PB_BOX]]
+  // CHECK: } // end sil function '$SSo4HiveC17objc_factory_initE10otherQueenABSo3BeeC_tcfC'
   convenience init(otherQueen other: Bee) {
     self.init(queen: other)
   }
@@ -66,6 +67,7 @@ class SubHive : Hive {
   // CHECK:   [[HIVE_INIT_FN:%.*]] = objc_method [[OBJC_METATYPE]] : $@objc_metatype Hive.Type, #Hive.init!allocator.1.foreign
   // CHECK:   apply [[HIVE_INIT_FN]]([[QUEEN]], [[OBJC_METATYPE]]) : $@convention(objc_method) (Optional<Bee>, @objc_metatype Hive.Type) -> @autoreleased Optional<Hive>
   // CHECK:   destroy_value [[QUEEN]]
+  // CHECK: } // end sil function '$S17objc_factory_init7SubHiveC20delegatesToInheritedACyt_tcfC'
   convenience init(delegatesToInherited: ()) {
     self.init(queen: Bee())
   }

test/SILOptimizer/definite_init_diagnostics.swift

@@ -433,7 +433,7 @@ class DelegatingCtorClass {
 
   convenience init(x: EmptyStruct, y: EmptyStruct) {
     _ = ivar       // expected-error {{'self' used before 'self.init' call}}
-    ivar = x       // expected-error* {{'self' used before 'self.init' call}}
+    ivar = x       // expected-error {{'self' used before 'self.init' call}}
     self.init()
   }
 
@@ -443,7 +443,7 @@ class DelegatingCtorClass {
   }
 
   convenience init(x: (EmptyStruct, EmptyStruct)) {
-    method()       // expected-error* {{'self' used before 'self.init' call}}
+    method()       // expected-error {{'self' used before 'self.init' call}}
     self.init()
   }
 

test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift

@@ -128,16 +128,16 @@ class ErrantClass : ErrantBaseClass {
     do {
       try self.init()
     } catch let e {
-      something(x) // expected-error* {{'self' used before 'self.init'}}
-      something(self.x) // expected-error* {{'self' used before 'self.init'}}
+      something(x) // expected-error {{'self' used before 'self.init'}}
+      something(self.x) // expected-error {{'self' used before 'self.init'}}
 
-      something(y) // expected-error* {{'self' used before 'self.init'}}
-      something(self.y) // expected-error* {{'self' used before 'self.init'}}
+      something(y) // expected-error {{'self' used before 'self.init'}}
+      something(self.y) // expected-error {{'self' used before 'self.init'}}
 
-      something(&y) // expected-error* {{'self' used before 'self.init'}}
-      something(&self.y) // expected-error* {{'self' used before 'self.init'}}
+      something(&y) // expected-error {{'self' used before 'self.init'}}
+      something(&self.y) // expected-error {{'self' used before 'self.init'}}
 
-      something(self) // expected-error* {{'self' used before 'self.init'}}
+      something(self) // expected-error {{'self' used before 'self.init'}}
 
       something(type(of: self))
 

test/Serialization/Recovery/typedefs.swift

@@ -181,10 +181,10 @@ open class User {
 // 20 CHECK-VTABLE-NEXT: #User.subscript!getter.1:
 // 21 CHECK-VTABLE-NEXT: #User.subscript!getter.1:
 // 22 CHECK-VTABLE-NEXT: #User.init!allocator.1:
-// 26 CHECK-VTABLE-NEXT: #User.init!allocator.1:
-// 27 CHECK-VTABLE-NEXT: #User.init!allocator.1:
-// 28 CHECK-VTABLE-NEXT: #User.init!allocator.1:
-// 30 CHECK-VTABLE-NEXT: #User.lastMethod!1:
+// 23 CHECK-VTABLE-NEXT: #User.init!allocator.1:
+// 24 CHECK-VTABLE-NEXT: #User.init!allocator.1:
+// 25 CHECK-VTABLE-NEXT: #User.init!allocator.1:
+// 26 CHECK-VTABLE-NEXT: #User.lastMethod!1:
 // CHECK-VTABLE: }