---

yaml
---
r: 319351
b: refs/heads/master-rebranch
c: 22a8a8f
h: refs/heads/master
i:
  319349: 06dd8e6
  319347: 0fe8a02
  319343: 803b96d

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: ec8b8275b729a15cf403ee6d193256718f53471d
+refs/heads/master-rebranch: 22a8a8f4068c8219c753df54bf56710dfed5a3f1

branches/master-rebranch/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -68,6 +68,8 @@ ERROR(conformance_removed,none,"%0 has removed %select{conformance to|inherited
 
 ERROR(conformance_added,none,"%0 has added inherited protocol %1", (StringRef, StringRef))
 
+ERROR(existing_conformance_added,none,"%0 has added a conformance to an existing protocol %1", (StringRef, StringRef))
+
 ERROR(default_associated_type_removed,none,"%0 has removed default type %1", (StringRef, StringRef))
 
 ERROR(protocol_req_added,none,"%0 has been added as a protocol requirement", (StringRef))

branches/master-rebranch/test/api-digester/Outputs/Cake-abi.txt

@@ -73,7 +73,10 @@ cake1: Func ObjCProtocol.addOptional() is now an optional requirement
 cake1: Func ObjCProtocol.removeOptional() is no longer an optional requirement
 cake1: Protocol P3 has removed inherited protocol P2
 cake1: Struct fixedLayoutStruct has removed conformance to P1
+cake2: Class C7 has added a conformance to an existing protocol P1
+cake2: Class SuperClassChange has added a conformance to an existing protocol P1
 cake2: Protocol P3 has added inherited protocol P4
+cake2: Struct fixedLayoutStruct has added a conformance to an existing protocol P2
 
 /* Protocol Requirement Change */
 cake1: Accessor HasMutatingMethodClone.bar.Get() now requires new witness table entry

branches/master-rebranch/tools/swift-api-digester/CMakeLists.txt

@@ -2,7 +2,6 @@ add_swift_host_tool(swift-api-digester
   swift-api-digester.cpp
   ModuleAnalyzerNodes.cpp
   ModuleDiagsConsumer.cpp
-  SWIFT_COMPONENT tools
   SWIFT_COMPONENT toolchain-tools
 )
 target_link_libraries(swift-api-digester

branches/master-rebranch/tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -845,10 +845,7 @@ static bool isSDKNodeEqual(SDKContext &Ctx, const SDKNode &L, const SDKNode &R)
 }
 
 bool SDKContext::isEqual(const SDKNode &Left, const SDKNode &Right) {
-  if (!EqualCache[&Left].count(&Right)) {
-    EqualCache[&Left][&Right] = isSDKNodeEqual(*this, Left, Right);
-  }
-  return EqualCache[&Left][&Right];
+  return isSDKNodeEqual(*this, Left, Right);
 }
 
 AccessLevel SDKContext::getAccessLevel(const ValueDecl *VD) const {

branches/master-rebranch/tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -160,8 +160,6 @@ class SDKContext {
 
   CheckerOptions Opts;
   std::vector<BreakingAttributeInfo> BreakingAttrs;
-  /// This is to cache the equal comparison results between nodes.
-  llvm::DenseMap<const SDKNode*, llvm::DenseMap<const SDKNode*, bool>> EqualCache;
 
 public:
   SDKContext(CheckerOptions Options);

branches/master-rebranch/tools/swift-api-digester/ModuleDiagsConsumer.cpp

@@ -63,6 +63,7 @@ static StringRef getCategoryName(uint32_t ID) {
   case LocalDiagID::conformance_added:
   case LocalDiagID::conformance_removed:
   case LocalDiagID::optional_req_changed:
+  case LocalDiagID::existing_conformance_added:
     return "/* Protocol Conformance Change */";
   case LocalDiagID::default_associated_type_removed:
   case LocalDiagID::protocol_req_added:

branches/master-rebranch/tools/swift-api-digester/swift-api-digester.cpp

@@ -951,6 +951,8 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
   SDKContext &Ctx;
   UpdatedNodesMap &UpdateMap;
   llvm::StringSet<> ProtocolReqWhitelist;
+  SDKNodeRoot *LeftRoot;
+  SDKNodeRoot *RightRoot;
 
   static void printSpaces(llvm::raw_ostream &OS, SDKNode *N) {
     assert(N);
@@ -1028,6 +1030,12 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
         auto *TD = Conf->getNominalTypeDecl();
         if (TD->isProtocol()) {
           TD->emitDiag(diag::conformance_added, Conf->getName());
+        } else {
+          // Adding conformance to an existing type can be ABI breaking.
+          if (Ctx.checkingABI() &&
+              !LeftRoot->getDescendantsByUsr(Conf->getUsr()).empty()) {
+            TD->emitDiag(diag::existing_conformance_added, Conf->getName());
+          }
         }
       }
 
@@ -1128,6 +1136,8 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
   }
 
   void pass(NodePtr Left, NodePtr Right) override {
+    LeftRoot = Left->getAs<SDKNodeRoot>();
+    RightRoot = Right->getAs<SDKNodeRoot>();
     foundMatch(Left, Right, NodeMatchReason::Root);
   }
 };
@@ -2258,6 +2268,10 @@ static int prepareForDump(const char *Main,
 
   if (!options::Triple.empty())
     InitInvok.setTargetTriple(options::Triple);
+
+  // Ensure the tool works on linux properly
+  InitInvok.getLangOptions().EnableObjCInterop =
+    InitInvok.getLangOptions().Target.isOSDarwin();
   InitInvok.getClangImporterOptions().ModuleCachePath =
   options::ModuleCachePath;
 

branches/master-rebranch/utils/api_checker/CMakeLists.txt

@@ -1,12 +1,6 @@
-swift_install_in_component(FILES "swift-api-checker.py"
-                           DESTINATION "bin"
-                           COMPONENT tools)
 swift_install_in_component(FILES "swift-api-checker.py"
                            DESTINATION "bin"
                            COMPONENT toolchain-tools)
-swift_install_in_component(DIRECTORY "sdk-module-lists"
-                           DESTINATION "bin"
-                           COMPONENT tools)
 swift_install_in_component(DIRECTORY "sdk-module-lists"
                            DESTINATION "bin"
                            COMPONENT toolchain-tools)