Address review comments

Author: Harlan Haskins

lib/AST/ASTPrinter.cpp

@@ -65,8 +65,11 @@ void PrintOptions::clearSynthesizedExtension() {
 }
 
 static bool contributesToParentTypeStorage(const AbstractStorageDecl *ASD) {
-  return ASD->getDeclContext()->isTypeContext() && ASD->hasStorage() &&
-         !ASD->isStatic();
+  auto *DC = ASD->getDeclContext()->getAsDecl();
+  if (!DC) return false;
+  auto *ND = dyn_cast<NominalTypeDecl>(DC);
+  if (!ND) return false;
+  return !ND->isResilient() && ASD->hasStorage() && !ASD->isStatic();
 }
 
 PrintOptions PrintOptions::printTextualInterfaceFile() {

lib/Sema/TypeCheckDecl.cpp

@@ -945,16 +945,8 @@ static void checkRedeclaration(TypeChecker &tc, ValueDecl *current) {
 
 /// Does the context allow pattern bindings that don't bind any variables?
 static bool contextAllowsPatternBindingWithoutVariables(DeclContext *dc) {
-  
-  // Property decls in type context must bind variables unless in a module
-  // interface, where private members don't bind variables but contribute
-  // to storage.
-  if (dc->isTypeContext()) {
-    if (auto SF = dc->getParentSourceFile())
-      if (SF->Kind == SourceFileKind::Interface)
-        return true;
+  if (dc->isTypeContext())
     return false;
-  }
 
   // Global variable decls must bind variables, except in scripts.
   if (dc->isModuleScopeContext()) {

test/ModuleInterface/private-stored-members.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
-// R UN: %target-swift-frontend -emit-module -o %t/Test~partial.swiftmodule -module-name Test -primary-file %s
-// R UN: %target-swift-frontend -merge-modules -emit-module -o %t/Test.swiftmodule %t/Test~partial.swiftmodule
-// R UN: %target-swift-ide-test -print-module -module-to-print=Test -source-filename=x -I %t | %FileCheck %s
+// RUN: %target-swift-frontend -emit-module -o %t/Test~partial.swiftmodule -module-name Test -primary-file %s
+// RUN: %target-swift-frontend -merge-modules -emit-module -o %t/Test.swiftmodule %t/Test~partial.swiftmodule
+// RUN: %target-swift-ide-test -print-module -module-to-print=Test -source-filename=x -I %t | %FileCheck %s
 
 // RUN: %target-swift-frontend -emit-interface-path %t.swiftinterface -enable-resilience -emit-module -o /dev/null %s
 // RUN: %FileCheck %s < %t.swiftinterface