---

yaml
---
r: 347354
b: refs/heads/master
c: dc2a19e
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -100,7 +100,7 @@ static void addMandatoryOptPipeline(SILPassPipelinePlan &P) {
   // there.
   const auto &Options = P.getOptions();
   P.addClosureLifetimeFixup();
-  if (Options.EnableMandatorySemanticARCOpts && Options.shouldOptimize()) {
+  if (Options.shouldOptimize()) {
     P.addSemanticARCOpts();
   }
   if (Options.StripOwnershipDuringDiagnosticsPipeline)

trunk/tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -38,6 +38,7 @@
 #include "swift/AST/USRGeneration.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/DiagnosticsModuleDiffer.h"
 #include "swift/Basic/ColorUtils.h"
 #include "swift/Basic/JSONSerialization.h"
 #include "swift/Basic/LLVMInitialize.h"
@@ -195,6 +196,7 @@ class SDKContext {
   bool shouldIgnore(Decl *D, const Decl* Parent = nullptr) const;
   ArrayRef<BreakingAttributeInfo> getBreakingAttributeInfo() const { return BreakingAttrs; }
   Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
+
   template<class YAMLNodeTy, typename ...ArgTypes>
   void diagnose(YAMLNodeTy node, Diag<ArgTypes...> ID,
                 typename detail::PassArgument<ArgTypes>::type... args) {
@@ -336,6 +338,19 @@ class SDKNodeDecl: public SDKNode {
   uint8_t getFixedBinaryOrder() const { return *FixedBinaryOrder; }
   virtual void jsonize(json::Output &Out) override;
   virtual void diagnose(SDKNode *Right) override;
+
+  // The first argument of the diag is always screening info.
+  template<typename ...ArgTypes>
+  void emitDiag(Diag<StringRef, ArgTypes...> ID,
+                typename detail::PassArgument<ArgTypes>::type... Args) const {
+    // Don't emit objc decls if we care about swift exclusively
+    if (Ctx.getOpts().SwiftOnly) {
+      if (isObjc())
+        return;
+    }
+    Ctx.getDiags().diagnose(SourceLoc(), ID, getScreenInfo(),
+                            std::move(Args)...);
+  }
 };
 
 class SDKNodeRoot: public SDKNode {