---

yaml
---
r: 347255
b: refs/heads/master
c: 07fd38f
h: refs/heads/master
i:
  347253: 405a6ca
  347251: 0820573
  347247: bd2d98e

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 735003752681e409e7c5dbdcefce256f31d6742e
+refs/heads/master: 07fd38f97d87d70a2cd037019ca772f62d03460a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Serialization/Deserialization.cpp

@@ -4329,28 +4329,35 @@ class swift::TypeDeserializer {
                                                  underlyingTypeID,
                                                  substitutedTypeID,
                                                  substitutionsID);
-    auto aliasOrError = MF.getDeclChecked(typealiasID);
-    if (!aliasOrError)
-      return aliasOrError.takeError();
-    auto alias = dyn_cast<TypeAliasDecl>(aliasOrError.get());
-
-    bool formSugaredType = true;
 
+    TypeAliasDecl *alias = nullptr;
     Type underlyingType;
     if (ctx.LangOpts.EnableDeserializationRecovery) {
       auto underlyingTypeOrError = MF.getTypeChecked(underlyingTypeID);
-      if (!underlyingTypeOrError)
+      if (!underlyingTypeOrError) {
+        // If we can't deserialize the underlying type, we can't be sure the
+        // actual typealias hasn't changed.
         return underlyingTypeOrError.takeError();
+      }
 
       underlyingType = underlyingTypeOrError.get();
 
+      if (auto aliasOrError = MF.getDeclChecked(typealiasID)) {
+        alias = dyn_cast<TypeAliasDecl>(aliasOrError.get());
+      } else {
+        // We're going to recover by falling back to the underlying type, so
+        // just ignore the error.
+        llvm::consumeError(aliasOrError.takeError());
+      }
+
       if (!alias ||
           !alias->getDeclaredInterfaceType()->isEqual(underlyingType)) {
         // Fall back to the canonical type.
-        formSugaredType = false;
+        return underlyingType;
       }
 
     } else {
+      alias = dyn_cast<TypeAliasDecl>(MF.getDecl(typealiasID));
       underlyingType = MF.getType(underlyingTypeID);
     }
 
@@ -4377,9 +4384,6 @@ class swift::TypeDeserializer {
       return underlyingType;
     }
 
-    if (!formSugaredType)
-      return underlyingType;
-
     auto parentType = parentTypeOrError.get();
     return TypeAliasType::get(alias, parentType, subMap, substitutedType);
   }

trunk/test/Serialization/Recovery/Inputs/custom-modules/TypeRemovalObjC.h

@@ -12,6 +12,8 @@ __attribute__((objc_root_class))
 
 @protocol SomeProto
 @end
+
+typedef long long SomeTypedef;
 #endif
 
 @protocol ZProto

trunk/test/Serialization/Recovery/type-removal-objc.swift

@@ -34,6 +34,13 @@ public let someProtoCompositionValue: (AProto & SomeProto)? = nil
 // CHECK-RECOVERY-NEGATIVE-NOT: let someProtoCompositionValue2:
 public let someProtoCompositionValue2: (SomeProto & ZProto)? = nil
 
+// CHECK-DAG: let someTypedefValue: SomeTypedef
+// CHECK-RECOVERY-DAG: let someTypedefValue: Int64
+public let someTypedefValue: SomeTypedef = 0
+// CHECK-DAG: let someTypedefOptValue: SomeTypedef?
+// CHECK-RECOVERY-DAG: let someTypedefOptValue: Int64?
+public let someTypedefOptValue: SomeTypedef? = nil
+
 // CHECK-DAG: unowned var someUnownedObject: @sil_unowned Base
 // CHECK-RECOVERY-NEGATIVE-NOT: var someUnownedObject:
 public unowned var someUnownedObject: Base = Base()