---

yaml
---
r: 293862
b: refs/heads/tensorflow
c: 3eff026
h: refs/heads/master

Author: jrose-apple

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 73b7185a3d5b4b6253a8206cf32336cf87df8f89
+refs/heads/tensorflow: 3eff026bbff634e7d79fd214335f520a342dbc1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/include/swift/AST/DiagnosticsFrontend.def

@@ -265,6 +265,9 @@ WARNING(warn_unsupported_module_interface_swift_version,none,
         "module interfaces are only supported with Swift language version 5 "
         "or later (currently using -swift-version %0)",
         (StringRef))
+WARNING(warn_unsupported_module_interface_library_evolution,none,
+        "module interfaces are only supported with -enable-library-evolution",
+        ())
 ERROR(error_extracting_version_from_module_interface,none,
       "error extracting version from module interface", ())
 ERROR(unsupported_version_of_module_interface,none,

branches/tensorflow/lib/FrontendTool/FrontendTool.cpp

@@ -373,6 +373,10 @@ printParseableInterfaceIfNeeded(StringRef outputPath,
                    diag::warn_unsupported_module_interface_swift_version,
                    LangOpts.isSwiftVersionAtLeast(4, 2) ? "4.2" : "4");
   }
+  if (M->getResilienceStrategy() != ResilienceStrategy::Resilient) {
+    diags.diagnose(SourceLoc(),
+                   diag::warn_unsupported_module_interface_library_evolution);
+  }
   return withOutputFile(diags, outputPath,
                         [M, Opts](raw_ostream &out) -> bool {
     return swift::emitParseableInterface(out, Opts, M);

branches/tensorflow/test/ParseableInterface/imports.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -emit-module -o %t/empty.swiftmodule %S/../Inputs/empty.swift
-// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path - %s %S/Inputs/imports-other.swift -I %S/Inputs/imports-clang-modules/ -I %t -verify -swift-version 5 | %FileCheck -implicit-check-not BAD %s
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path - %s %S/Inputs/imports-other.swift -I %S/Inputs/imports-clang-modules/ -I %t -verify -swift-version 5 -enable-library-evolution | %FileCheck -implicit-check-not BAD %s
 
 
 @_exported import empty

branches/tensorflow/test/ParseableInterface/swift-version.swift

@@ -0,0 +1,33 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/empty.swiftinterface %s -swift-version 4 2>&1 | %FileCheck -DVERSION=4 %s
+// RUN: ls %t/empty.swiftinterface
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/empty.swiftinterface %s -swift-version 4.2 2>&1 | %FileCheck -DVERSION=4.2 %s
+// RUN: ls %t/empty.swiftinterface
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/empty.swiftinterface %s -swift-version 4.2 -enable-library-evolution 2>&1 | %FileCheck -check-prefix=CHECK-VERSION-ONLY -DVERSION=4.2 %s
+// RUN: ls %t/empty.swiftinterface
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/empty.swiftinterface %s -swift-version 5 2>&1 | %FileCheck -check-prefix=CHECK-EVOLUTION-ONLY %s
+// RUN: ls %t/empty.swiftinterface
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/empty.swiftinterface %s -swift-version 5 -enable-library-evolution 2>&1 | %FileCheck -check-prefix=NEGATIVE -allow-empty %s
+// RUN: ls %t/empty.swiftinterface
+
+// CHECK-DAG: warning: module interfaces are only supported with Swift language version 5 or later (currently using -swift-version [[VERSION]])
+// CHECK-DAG: warning: module interfaces are only supported with -enable-library-evolution
+
+// CHECK-VERSION-ONLY-NOT: warning:
+// CHECK-VERSION-ONLY: warning: module interfaces are only supported with Swift language version 5 or later (currently using -swift-version [[VERSION]])
+// CHECK-VERSION-ONLY-NOT: warning:
+
+// CHECK-EVOLUTION-ONLY-NOT: warning:
+// CHECK-EVOLUTION-ONLY: warning: module interfaces are only supported with -enable-library-evolution
+// CHECK-EVOLUTION-ONLY-NOT: warning:
+
+// NEGATIVE-NOT: warning:
+// NEGATIVE-NOT: error: