Serialization: Protect getType for params and classes

Author: xymus

lib/Serialization/Deserialization.cpp

@@ -4084,7 +4084,9 @@ class DeclDeserializer {
 
     declOrOffset = param;
 
-    auto paramTy = MF.getType(interfaceTypeID);
+    Type paramTy;
+    SET_OR_RETURN_ERROR(paramTy, MF.getTypeChecked(interfaceTypeID));
+
     if (paramTy->hasError() && !MF.allowCompilerErrors()) {
       // FIXME: This should never happen, because we don't serialize
       // error types.
@@ -4106,7 +4108,9 @@ class DeclDeserializer {
     if (auto defaultArg = getActualDefaultArgKind(rawDefaultArg)) {
       param->setDefaultArgumentKind(*defaultArg);
 
-      if (auto exprType = MF.getType(defaultExprType))
+      Type exprType;
+      SET_OR_RETURN_ERROR(exprType, MF.getTypeChecked(defaultExprType));
+      if (exprType)
         param->setDefaultExprType(exprType);
 
       auto isoKind = *getActualActorIsolationKind(rawDefaultArgIsolation);
@@ -4952,7 +4956,11 @@ class DeclDeserializer {
     if (isImplicit)
       theClass->setImplicit();
     theClass->setIsObjC(isObjC);
-    theClass->setSuperclass(MF.getType(superclassID));
+
+    Type superclass;
+    SET_OR_RETURN_ERROR(superclass, MF.getTypeChecked(superclassID));
+    theClass->setSuperclass(superclass);
+
     ctx.evaluator.cacheOutput(InheritsSuperclassInitializersRequest{theClass},
                               std::move(inheritsSuperclassInitializers));
     ctx.evaluator.cacheOutput(HasMissingDesignatedInitializersRequest{theClass},

test/Serialization/Recovery/implementation-only-missing.swift

@@ -61,7 +61,7 @@ public protocol HiddenProtocolWithOverride {
   func hiddenOverride()
 }
 
-public class HiddenClass {}
+open class HiddenClass {}
 
 public struct HiddenRawType: ExpressibleByStringLiteral, Equatable, CustomStringConvertible {
 
@@ -148,6 +148,14 @@ enum InternalEnumWithRawType: HiddenRawType {
     case a
 }
 
+class InternalSubclass: HiddenClass {}
+class GenericBase<T> {}
+class Sub: GenericBase<Sub.Nested> {
+  class Nested: HiddenClass {}
+}
+
+func InternalFuncWithParam(a: HiddenRawType)  {}
+
 //--- Client.swift
 
 import PublicLib