[test] Add some more tests for 73d4526.

There's still nothing really complicated going on here, such as an
override that previously satisfied a protocol conformance.

Author: jrose-apple

test/Serialization/Recovery/Inputs/custom-modules/Overrides.h

@@ -3,7 +3,33 @@
 @end
 
 @interface Base : Object
-#ifndef BAD
-- (void)method;
+#if !BAD
+- (void)disappearingMethod;
+- (nullable id)nullabilityChangeMethod;
+- (nonnull id)typeChangeMethod;
+#else
+//- (void)disappearingMethod;
+- (nonnull id)nullabilityChangeMethod;
+- (nonnull Base *)typeChangeMethod;
+#endif
+@end
+
+@interface Base (ExtraMethodsToTriggerCircularReferences)
+#if !BAD
+- (void)disappearingMethodWithOverload;
+#else
+//- (void)disappearingMethodWithOverload;
+#endif
+@end
+
+@interface GenericBase<Element>: Object
+#if !BAD
+- (void)disappearingMethod;
+- (nullable Element)nullabilityChangeMethod;
+- (nonnull id)typeChangeMethod;
+#else
+//- (void)disappearingMethod;
+- (nonnull Element)nullabilityChangeMethod;
+- (nonnull Element)typeChangeMethod;
 #endif
 @end

test/Serialization/Recovery/crash-recovery.swift

@@ -9,12 +9,12 @@
 import Overrides
 
 public class Sub: Base {
-  public override func method() {}
+  public override func disappearingMethod() {}
 }
 
 // CHECK-CRASH: error: fatal error encountered while reading from module 'Lib'; please file a bug report with your project and the crash log
 // CHECK-CRASH-3-NOT: note
 // CHECK-CRASH-4: note: compiling as Swift 4.0, with 'Lib' built as Swift 3.1
 // CHECK-CRASH-LABEL: *** DESERIALIZATION FAILURE (please include this section in any bug report) ***
-// CHECK-CRASH: could not find 'method()' in parent class
+// CHECK-CRASH: could not find 'disappearingMethod()' in parent class
 // CHECK-CRASH: While loading members for 'Sub' in module 'Lib'

test/Serialization/Recovery/overrides.swift

@@ -9,15 +9,47 @@
 
 import Overrides
 
-public class Sub: Base {
-  public override func method() {}
+// Please use prefixes to keep the printed parts of this file in alphabetical
+// order.
+
+public class SwiftOnlyClass {}
+
+public class A_Sub: Base {
+  public override func disappearingMethod() {}
+  public override func nullabilityChangeMethod() -> Any? { return nil }
+  public override func typeChangeMethod() -> Any { return self }
+  public override func disappearingMethodWithOverload() {}
+}
+
+// CHECK-LABEL: class A_Sub : Base {
+// CHECK-NEXT: func disappearingMethod()
+// CHECK-NEXT: func nullabilityChangeMethod() -> Any?
+// CHECK-NEXT: func typeChangeMethod() -> Any
+// CHECK-NEXT: func disappearingMethodWithOverload()
+// CHECK-NEXT: init()
+// CHECK-NEXT: {{^}$}}
+
+// CHECK-RECOVERY-LABEL: class A_Sub : Base {
+// CHECK-RECOVERY-NEXT: init()
+// CHECK-RECOVERY-NEXT: {{^}$}}
+
+extension Base {
+  @nonobjc func disappearingMethodWithOverload() -> SwiftOnlyClass? { return nil }
+}
+
+public class B_GenericSub : GenericBase<Base> {
+  public override func disappearingMethod() {}
+  public override func nullabilityChangeMethod() -> Base? { return nil }
+  public override func typeChangeMethod() -> Any { return self }
 }
 
-// CHECK-LABEL: class Sub : Base {
-// CHECK-NEXT: func method()
+// CHECK-LABEL: class B_GenericSub : GenericBase<Base> {
+// CHECK-NEXT: func disappearingMethod()
+// CHECK-NEXT: func nullabilityChangeMethod() -> Base?
+// CHECK-NEXT: func typeChangeMethod() -> Any
 // CHECK-NEXT: init()
 // CHECK-NEXT: {{^}$}}
 
-// CHECK-RECOVERY-LABEL: class Sub : Base {
+// CHECK-RECOVERY-LABEL: class B_GenericSub : GenericBase<Base> {
 // CHECK-RECOVERY-NEXT: init()
 // CHECK-RECOVERY-NEXT: {{^}$}}