---

yaml
---
r: 347512
b: refs/heads/master
c: 5cc51e6
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 361de06ce8d842121d865e9dbc4a7b16ebda81f5
+refs/heads/master: 5cc51e6cd68c1586e9f9e3c2b17cbc5978f4f25a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -537,10 +537,6 @@ class swift::ParseableInterfaceBuilder {
         return;
       }
 
-      // Optimize emitted modules. This has to happen after we parse arguments,
-      // because parseSILOpts would override the current optimization mode.
-      subInvocation.getSILOptions().OptMode = OptimizationMode::ForSpeed;
-
       // Build the .swiftmodule; this is a _very_ abridged version of the logic
       // in performCompile in libFrontendTool, specialized, to just the one
       // module-serialization task we're trying to do here.

trunk/test/ParseableInterface/optimization-level.swift

@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/Lib.swiftinterface %s -O
+// RUN: %target-swift-frontend -build-module-from-parseable-interface %t/Lib.swiftinterface -Xllvm -sil-print-pass-name -o /dev/null 2>&1 | %FileCheck --check-prefix OPT %s
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t/Lib.swiftinterface %s -Onone
+// RUN: %target-swift-frontend -build-module-from-parseable-interface %t/Lib.swiftinterface -Xllvm -sil-print-pass-name -o /dev/null 2>&1 | %FileCheck --check-prefix UNOPT %s
+
+// This is a bit of an implementation detail, but we want to make sure
+// optimization passes don't run when compiling a .swiftinterface that was
+// generated with -Onone.
+
+// OPT: EagerSpecializer
+// UNOPT-NOT: EagerSpecializer
+public func f() {}
+

trunk/test/SourceKit/InterfaceGen/gen_swift_module.swift

@@ -30,6 +30,6 @@ func f(s : inout [Int]) {
 // Test we can generate the interface of a module loaded via a .swiftinterface file correctly
 
 // RUN: %empty-directory(%t.mod)
-// RUN: %swift -emit-module -o /dev/null -emit-parseable-module-interface-path %t.mod/swift_mod.swiftinterface %S/Inputs/swift_mod.swift -parse-as-library
+// RUN: %swift -emit-module -o /dev/null -emit-parseable-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library
 // RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -I %t.mod -module-cache-path %t.mod/mcp > %t.response
 // RUN: diff -u %s.from_swiftinterface.response %t.response