commit ec61374e55a79d107ea0417f8a5858775c67e085
author swift-ci <swift-ci@users.noreply.github.com> Tue Mar 21 17:42:58 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Tue Mar 21 17:42:58 2017 -0700
tree f8e7e63c313100f8a90a915cd85b91ce079e8b31
parent e88a94802df0696744d3d642312b0e8f2a578216
parent 77b753c40b9dbb7d92271018686b30820f831795

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

lib/Serialization/ASTReader.cpp

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 8a10356..a114759 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -4849,13 +4849,9 @@
         if (!CurrentModule->getUmbrellaHeader())
           ModMap.setUmbrellaHeader(CurrentModule, Umbrella, Blob);
         else if (CurrentModule->getUmbrellaHeader().Entry != Umbrella) {
-          // This can be a spurious difference caused by changing the VFS to
-          // point to a different copy of the file, and it is too late to
-          // to rebuild safely.
-          // FIXME: If we wrote the virtual paths instead of the 'real' paths,
-          // after input file validation only real problems would remain and we
-          // could just error. For now, assume it's okay.
-          break;
+          if ((ClientLoadCapabilities & ARR_OutOfDate) == 0)
+            Error("mismatched umbrella headers in submodule");
+          return OutOfDate;
         }
       }
       break;