Serialization: Bubble up more errors under readSILFunctionChecked

rdar://131414533

Author: xymus

lib/Serialization/Deserialization.cpp

@@ -55,16 +55,6 @@
 
 #define DEBUG_TYPE "Serialization"
 
-// Unwrap an Expected<> variable following the typical deserialization pattern:
-// - On a value, assign it to Output.
-// - On an error, return it to bubble it up to the caller.
-#define UNWRAP(Input, Output) { \
-  auto ValueOrError = Input; \
-  if (!ValueOrError) \
-      return ValueOrError.takeError(); \
-  Output = ValueOrError.get(); \
-}
-
 STATISTIC(NumDeclsLoaded, "# of decls deserialized");
 STATISTIC(NumMemberListsLoaded,
           "# of nominals/extensions whose members were loaded");

lib/Serialization/DeserializationErrors.h

@@ -21,6 +21,16 @@
 #include "llvm/Support/Error.h"
 #include "llvm/Support/PrettyStackTrace.h"
 
+// Unwrap an Expected<> variable following the typical deserialization pattern:
+// - On a value, assign it to Output.
+// - On an error, return it to bubble it up to the caller.
+#define UNWRAP(Input, Output) { \
+  auto ValueOrError = Input; \
+  if (!ValueOrError) \
+      return ValueOrError.takeError(); \
+  Output = ValueOrError.get(); \
+}
+
 namespace swift {
 namespace serialization {
 

lib/Serialization/DeserializeSIL.cpp

@@ -625,7 +625,9 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
 
   ValueDecl *clangNodeOwner = nullptr;
   if (clangNodeOwnerID != 0) {
-    clangNodeOwner = dyn_cast_or_null<ValueDecl>(MF->getDecl(clangNodeOwnerID));
+    Decl *clangNodeOwnerDecl;
+    UNWRAP(MF->getDeclChecked(clangNodeOwnerID), clangNodeOwnerDecl);
+    clangNodeOwner = dyn_cast_or_null<ValueDecl>(clangNodeOwnerDecl);
     if (!clangNodeOwner)
       return MF->diagnoseFatal("invalid clang node owner for SILFunction");
   }