Fix test typo & remove too-strict assertion.

Author: David Ungar

include/swift/AST/TypeCheckRequests.h

@@ -362,7 +362,6 @@ class DefaultTypeRequest
   TypeChecker &getTypeChecker() const;
   SourceFile *getSourceFile() const;
   Type &getCache() const;
-  bool isDependencyMissing(Type result) const;
 };
 
 /// The zone number for the type checker.

lib/AST/TypeCheckRequests.cpp

@@ -463,24 +463,7 @@ Type &DefaultTypeRequest::getCache() const {
 
 Optional<Type> DefaultTypeRequest::getCachedResult() const {
   auto const &cachedType = getCache();
-  if (!cachedType)
-    return None;
-  assert(!isDependencyMissing(cachedType) &&
-         "Since the cache is now cached by SourceFile, the dependency should "
-         "have been recorded when it was looked up.");
-  return cachedType;
-}
-
-bool DefaultTypeRequest::isDependencyMissing(Type result) const {
-  if (auto *SF = getSourceFile())
-    if (auto *tracker = SF->getReferencedNameTracker()) {
-      Identifier name = getDeclContext()->getASTContext().getIdentifier(
-          getTypeName(getKnownProtocolKind()));
-      DeclBaseName bn = DeclBaseName(name);
-      return tracker->getTopLevelNames().find(bn) ==
-             tracker->getTopLevelNames().end();
-    }
-  return false;
+  return cachedType ? Optional<Type>(cachedType) : None;
 }
 
 void DefaultTypeRequest::cacheResult(Type value) const { getCache() = value; }

test/NameBinding/reference-dependencies-consistency.swift

@@ -12,4 +12,4 @@
 //
 // RUN:  %target-swift-frontend -typecheck -primary-file %t/1.swift -primary-file %t/2.swift -emit-reference-dependencies-path %t/1.swiftdeps -emit-reference-dependencies-path %t/2.swiftdeps
 //
-// RUN cmp -s %t/1.swiftdeps %t/2.swiftdeps
+// RUN: cmp -s %t/1.swiftdeps %t/2.swiftdeps