Cosmetics.

Author: David Ungar

include/swift/AST/ASTContext.h

@@ -942,7 +942,7 @@ class ASTContext final {
     return !LangOpts.EnableAccessControl;
   }
 
-  /// Logically, there is a separate cache for each SourceFile.
+  /// Each kind and SourceFile has its own cache for a Type.
   Type &getDefaultTypeRequestCache(SourceFile *, KnownProtocolKind);
 
 private:

include/swift/AST/DeclContext.h

@@ -784,11 +784,10 @@ class IterableDeclContext {
 template <typename ParamT, typename = typename std::enable_if<
                                std::is_same<ParamT, DeclContext>::value>::type>
 void simple_display(llvm::raw_ostream &out, const ParamT *dc) {
-  if (!dc) {
+  if (dc)
+    dc->printContext(out, 0, true);
+  else
     out << "(null)";
-    return;
-  }
-  dc->printContext(out, 0, true);
 }
 
 } // end namespace swift

lib/AST/ASTContext.cpp

@@ -292,7 +292,8 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
 
   /// Caches of default types for DefaultTypeRequest.
   /// Used to be instance variables in the TypeChecker.
-  /// There is a logically separate cache for each SourceFile.
+  /// There is a logically separate cache for each SourceFile and
+  /// KnownProtocolKind.
   llvm::DenseMap<SourceFile *, std::array<Type, NumKnownProtocols>>
       DefaultTypeRequestCaches;