Merge remote-tracking branch 'github/master' into HEAD

Author: ainu-bot

lib/Sema/DerivedConformanceCodable.cpp

@@ -82,11 +82,8 @@ static CodableConformanceType typeConformsToCodable(DeclContext *context,
                                                     ProtocolDecl *proto) {
   target = context->mapTypeIntoContext(target);
 
-  if (isIUO) {
-    return typeConformsToCodable(context,
-                                 target->lookThroughSingleOptionalType(),
-                                 false, proto);
-  }
+  if (isIUO)
+    target = target->lookThroughSingleOptionalType();
 
   auto conf = TypeChecker::conformsToProtocol(target, proto, context);
   return conf.isInvalid() ? DoesNotConform : Conforms;

validation-test/compiler_crashers_2_fixed/sr13118.swift

@@ -0,0 +1,5 @@
+// RUN: %target-typecheck-verify-swift %s
+
+public struct S<T : Codable> : Codable {
+  var s: [T]!
+}