---

yaml
---
r: 344999
b: refs/heads/master
c: b6374e7
h: refs/heads/master
i:
  344997: 6f6088d
  344995: 0473498
  344991: 3a38989

Author: swift-ci

[refs]

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

trunk/include/swift/AST/DiagnosticEngine.h

@@ -672,6 +672,19 @@ namespace swift {
       return diagnose(Loc, Diagnostic(ID, std::move(Args)...));
     }
 
+    /// \brief Emit a diagnostic with the given set of diagnostic arguments.
+    ///
+    /// \param ID The diagnostic to be emitted.
+    ///
+    /// \param Args The diagnostic arguments, which will be converted to
+    /// the types expected by the diagnostic \p ID.
+    template<typename ...ArgTypes>
+    InFlightDiagnostic
+    diagnose(Diag<ArgTypes...> ID,
+             typename detail::PassArgument<ArgTypes>::type... Args) {
+      return diagnose(SourceLoc(), ID, std::move(Args)...);
+    }
+
     /// \brief Emit a diagnostic with the given set of diagnostic arguments.
     ///
     /// \param Loc The declaration name location to which the

trunk/include/swift/AST/DiagnosticsAll.def

@@ -49,6 +49,7 @@
 #include "DiagnosticsFrontend.def"
 #include "DiagnosticsDriver.def"
 #include "DiagnosticsRefactoring.def"
+#include "DiagnosticsModuleDiffer.def"
 
 #undef DIAG_NO_UNDEF
 

trunk/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -0,0 +1,62 @@
+//===--- DiagnosticsModuleDiffer.def - Diagnostics Text ---------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines diagnostics emitted during diffing two Swift modules.
+//  Each diagnostic is described using one of three kinds (error, warning, or
+//  note) along with a unique identifier, category, options, and text, and is
+//  followed by a signature describing the diagnostic argument kinds.
+//
+//===----------------------------------------------------------------------===//
+
+#if !(defined(DIAG) || (defined(ERROR) && defined(WARNING) && defined(NOTE)))
+#  error Must define either DIAG or the set {ERROR,WARNING,NOTE}
+#endif
+
+#ifndef ERROR
+#  define ERROR(ID,Options,Text,Signature)   \
+  DIAG(ERROR,ID,Options,Text,Signature)
+#endif
+
+#ifndef WARNING
+#  define WARNING(ID,Options,Text,Signature) \
+  DIAG(WARNING,ID,Options,Text,Signature)
+#endif
+
+#ifndef NOTE
+#  define NOTE(ID,Options,Text,Signature) \
+  DIAG(NOTE,ID,Options,Text,Signature)
+#endif
+
+ERROR(generic_sig_change,none,"%0 has generic signature change from %1 to %2", (StringRef, StringRef, StringRef))
+
+ERROR(raw_type_change,none,"%0(%1) is now %2 representable", (StringRef, StringRef, StringRef))
+
+ERROR(removed_decl,none,"%0 has been removed%select{| (deprecated)}1", (StringRef, bool))
+
+ERROR(moved_decl,none,"%0 has been moved to %1", (StringRef, StringRef))
+
+ERROR(renamed_decl,none,"%0 has been renamed to %1", (StringRef, StringRef))
+
+ERROR(decl_type_change,none,"%0 has %1 type change from %2 to %3", (StringRef, StringRef, StringRef, StringRef))
+
+ERROR(decl_attr_change,none,"%0 changes from %1 to %2", (StringRef, StringRef, StringRef))
+
+ERROR(decl_new_attr,none,"%0 is now %1", (StringRef, StringRef))
+
+#ifndef DIAG_NO_UNDEF
+# if defined(DIAG)
+#  undef DIAG
+# endif
+# undef NOTE
+# undef WARNING
+# undef ERROR
+#endif

trunk/include/swift/AST/DiagnosticsModuleDiffer.h

@@ -0,0 +1,32 @@
+//===--- DiagnosticsModuleDiffer.h - Diagnostic Definitions ----*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+/// \file
+/// \brief This file defines diagnostics for the Swift module differ.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_DIAGNOSTICS_MODULE_DIFFER_H
+#define SWIFT_DIAGNOSTICS_MODULE_DIFFER_H
+
+#include "swift/AST/DiagnosticsCommon.h"
+
+namespace swift {
+  namespace diag {
+  // Declare common diagnostics objects with their appropriate types.
+#define DIAG(KIND,ID,Options,Text,Signature) \
+  extern detail::DiagWithArguments<void Signature>::type ID;
+#include "DiagnosticsModuleDiffer.def"
+  }
+}
+
+#endif

trunk/include/swift/IDE/APIDigesterData.h

@@ -60,6 +60,11 @@ raw_ostream &operator<<(raw_ostream &Out, const NodeAnnotation Value);
 // Redefine << so that we can output the name of the node kind.
 raw_ostream &operator<<(raw_ostream &Out, const SDKNodeKind Value);
 
+StringRef getDeclKindStr(const DeclKind Value);
+
+// Redefine << so that we can output the name of decl kind.
+raw_ostream &operator<<(raw_ostream &Out, const DeclKind Value);
+
 struct APIDiffItem {
   virtual void streamDef(llvm::raw_ostream &S) const = 0;
   virtual APIDiffItemKind getKind() const = 0;

trunk/lib/IDE/APIDigesterData.cpp

@@ -23,7 +23,7 @@ using namespace swift;
 using namespace ide;
 using namespace api;
 
-inline raw_ostream &swift::ide::api::
+raw_ostream &swift::ide::api::
 operator<<(raw_ostream &Out, const SDKNodeKind Value) {
   switch (Value) {
 #define NODE_KIND(Name, Value) case SDKNodeKind::Name: return Out << #Value;
@@ -32,13 +32,26 @@ operator<<(raw_ostream &Out, const SDKNodeKind Value) {
   llvm_unreachable("Undefined SDK node kind.");
 }
 
-inline raw_ostream &swift::ide::api::
+raw_ostream &swift::ide::api::
 operator<<(raw_ostream &Out, const NodeAnnotation Value) {
 #define NODE_ANNOTATION(X) if (Value == NodeAnnotation::X) { return Out << #X; }
 #include "swift/IDE/DigesterEnums.def"
   llvm_unreachable("Undefined SDK node kind.");
 }
 
+StringRef swift::ide::api::getDeclKindStr(const DeclKind Value)  {
+  switch (Value) {
+#define DECL(X, PARENT) case DeclKind::X: return #X;
+#include "swift/AST/DeclNodes.def"
+  } 
+  llvm_unreachable("Unhandled DeclKind in switch.");
+}
+
+raw_ostream &swift::ide::api::operator<<(raw_ostream &Out,
+    const DeclKind Value) {
+  return Out << getDeclKindStr(Value);
+}
+
 Optional<SDKNodeKind> swift::ide::api::parseSDKNodeKind(StringRef Content) {
   return llvm::StringSwitch<Optional<SDKNodeKind>>(Content)
 #define NODE_KIND(NAME, VALUE) .Case(#VALUE, SDKNodeKind::NAME)

trunk/test/api-digester/Outputs/Cake-abi.txt

@@ -11,21 +11,21 @@ cake1: Func C4.foo() has been removed
 /* Moved Decls */
 
 /* Renamed Decls */
-cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 cake1: Func S1.foo5(x:y:) has been renamed to Func S1.foo5(x:y:z:)
+cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 
 /* Type Changes */
 cake1: Constructor S1.init(_:) has parameter 0 type change from Int to Double
 cake1: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
 cake1: Func Somestruct2.foo1(_:) has parameter 0 type change from C3 to C1
 
 /* Decl Attribute changes */
-cake1: Enum IceKind is now without @_frozen
-cake1: Struct C6 is now with @_fixed_layout
 cake1: Class C5 is now without @objc
-cake1: Var C1.CIIns1 changes from weak to strong
-cake1: Var C1.CIIns2 changes from strong to weak
+cake1: Enum IceKind is now without @_frozen
 cake1: Func C1.foo1() is now not static
 cake1: Func C5.dy_foo() is now with dynamic
 cake1: Func S1.foo1() is now mutating
 cake1: Func S1.foo3() is now static
+cake1: Struct C6 is now with @_fixed_layout
+cake1: Var C1.CIIns1 changes from weak to strong
+cake1: Var C1.CIIns2 changes from strong to weak

trunk/test/api-digester/Outputs/Cake.txt

@@ -11,16 +11,16 @@ cake1: Func C4.foo() has been removed
 /* Moved Decls */
 
 /* Renamed Decls */
-cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 cake1: Func S1.foo5(x:y:) has been renamed to Func S1.foo5(x:y:z:)
+cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 
 /* Type Changes */
 cake1: Constructor S1.init(_:) has parameter 0 type change from Int to Double
 cake1: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
 
 /* Decl Attribute changes */
-cake1: Var C1.CIIns1 changes from weak to strong
-cake1: Var C1.CIIns2 changes from strong to weak
 cake1: Func C1.foo1() is now not static
 cake1: Func S1.foo1() is now mutating
 cake1: Func S1.foo3() is now static
+cake1: Var C1.CIIns1 changes from weak to strong
+cake1: Var C1.CIIns2 changes from strong to weak

trunk/test/api-digester/source-stability.swift.expected

@@ -4,17 +4,6 @@
 /* RawRepresentable Changes */
 
 /* Removed Decls */
-TypeAlias AbsoluteValuable has been removed
-TypeAlias BitwiseOperations has been removed (deprecated)
-TypeAlias IntMax has been removed
-TypeAlias Integer has been removed
-TypeAlias IntegerArithmetic has been removed
-TypeAlias SignedNumber has been removed
-TypeAlias StringProtocol.UTF16Index has been removed (deprecated)
-TypeAlias StringProtocol.UTF8Index has been removed (deprecated)
-TypeAlias StringProtocol.UnicodeScalarIndex has been removed (deprecated)
-TypeAlias UIntMax has been removed
-Var FixedWidthInteger.allZeros has been removed (deprecated)
 Constructor Int.init(truncatingBitPattern:) has been removed
 Constructor Int16.init(truncatingBitPattern:) has been removed
 Constructor Int32.init(truncatingBitPattern:) has been removed
@@ -64,6 +53,17 @@ Func UInt32.toIntMax() has been removed
 Func UInt64.toIntMax() has been removed
 Func UInt8.toIntMax() has been removed
 Func UnsignedInteger.toUIntMax() has been removed
+TypeAlias AbsoluteValuable has been removed
+TypeAlias BitwiseOperations has been removed (deprecated)
+TypeAlias IntMax has been removed
+TypeAlias Integer has been removed
+TypeAlias IntegerArithmetic has been removed
+TypeAlias SignedNumber has been removed
+TypeAlias StringProtocol.UTF16Index has been removed (deprecated)
+TypeAlias StringProtocol.UTF8Index has been removed (deprecated)
+TypeAlias StringProtocol.UnicodeScalarIndex has been removed (deprecated)
+TypeAlias UIntMax has been removed
+Var FixedWidthInteger.allZeros has been removed (deprecated)
 
 /* Moved Decls */
 
@@ -72,12 +72,13 @@ Func Dictionary.filter(_:obsoletedInSwift4:) has been renamed to Func Dictionary
 Func Set.filter(_:obsoletedInSwift4:) has been renamed to Func Set.filter(_:)
 
 /* Type Changes */
-Var Dictionary.keys has declared type change from LazyMapCollection<[Key : Value], Key> to Dictionary<Key, Value>.Keys
-Var Dictionary.values has declared type change from LazyMapCollection<[Key : Value], Value> to Dictionary<Key, Value>.Values
 Constructor String.init(_:) has return type change from String? to String
 Func Dictionary.filter(_:obsoletedInSwift4:) has return type change from [Dictionary<Key, Value>.Element] to [Dictionary<Key, Value>.Key : Dictionary<Key, Value>.Value]
 Func Dictionary.makeIterator() has return type change from DictionaryIterator<Dictionary<Key, Value>.Key, Dictionary<Key, Value>.Value> to Dictionary<Key, Value>.Iterator
 Func Set.filter(_:obsoletedInSwift4:) has return type change from [Set<Element>.Element] to Set<Element>
 Func Set.makeIterator() has return type change from SetIterator<Element> to Set<Element>.Iterator
+Var Dictionary.keys has declared type change from LazyMapCollection<[Key : Value], Key> to Dictionary<Key, Value>.Keys
+Var Dictionary.values has declared type change from LazyMapCollection<[Key : Value], Value> to Dictionary<Key, Value>.Values
+
 
 /* Decl Attribute changes */

trunk/tools/swift-api-digester/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-api-digester
   swift-api-digester.cpp
   ModuleAnalyzerNodes.cpp
+  ModuleDiagsConsumer.cpp
   LINK_LIBRARIES swiftFrontend swiftIDE
   SWIFT_COMPONENT tools
 )

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

@@ -293,6 +293,22 @@ SDKNode *SDKNodeRoot::getInstance(SDKContext &Ctx) {
   return Info.createSDKNode(SDKNodeKind::Root);
 }
 
+StringRef SDKNodeDecl::getScreenInfo() const {
+  auto ModuleName = getModuleName();
+  auto HeaderName = getHeaderName();
+  auto &Ctx = getSDKContext();
+  llvm::SmallString<64> SS;
+  llvm::raw_svector_ostream OS(SS);
+  if (Ctx.getOpts().PrintModule)
+    OS << ModuleName;
+  if (!HeaderName.empty())
+    OS << "(" << HeaderName << ")";
+  if (!OS.str().empty())
+    OS << ": ";
+  OS << getDeclKind() << " " << getFullyQualifiedName();
+  return Ctx.buffer(OS.str());
+}
+
 bool SDKNodeDecl::isSDKPrivate() const {
   if (getName().startswith("__"))
     return true;

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

@@ -139,6 +139,7 @@ struct CheckerOptions {
   bool ABI;
   bool Verbose;
   bool AbortOnModuleLoadFailure;
+  bool PrintModule;
   StringRef LocationFilter;
 };
 
@@ -303,6 +304,7 @@ class SDKNodeDecl: public SDKNode {
   bool hasDeclAttribute(DeclAttrKind DAKind) const;
   bool isStatic() const { return IsStatic; };
   StringRef getGenericSignature() const { return GenericSig; }
+  StringRef getScreenInfo() const;
 };
 
 class SDKNodeRoot: public SDKNode {