---

yaml
---
r: 347831
b: refs/heads/master
c: ad887f9
h: refs/heads/master
i:
  347829: f8a9588
  347827: 405b1da
  347823: 0fda189

Author: swift-ci

[refs]

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

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

@@ -24,7 +24,7 @@ cake1: InfixOperator ..*.. has been changed to a PrefixOperator
 cake1: Protocol ProtocolToEnum has been changed to a Enum
 
 /* Renamed Decls */
-cake1: Func S1.foo5(x:y:) has been renamed to Func S1.foo5(x:y:z:)
+cake1: Func S1.foo5(x:y:) has been renamed to Func foo5(x:y:z:)
 cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 
 /* Type Changes */

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

@@ -23,7 +23,7 @@ cake1: InfixOperator ..*.. has been changed to a PrefixOperator
 cake1: Protocol ProtocolToEnum has been changed to a Enum
 
 /* Renamed Decls */
-cake1: Func S1.foo5(x:y:) has been renamed to Func S1.foo5(x:y:z:)
+cake1: Func S1.foo5(x:y:) has been renamed to Func foo5(x:y:z:)
 cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 
 /* Type Changes */

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

@@ -1942,10 +1942,9 @@ void DiagnosisEmitter::handle(const SDKNodeDecl *Node, NodeAnnotation Anno) {
     return;
   }
   case NodeAnnotation::Rename: {
-    auto *Count = UpdateMap.findUpdateCounterpart(Node)->getAs<SDKNodeDecl>();
     Node->emitDiag(diag::renamed_decl,
-        Ctx.buffer((Twine(getDeclKindStr(Count->getDeclKind())) + " " +
-          Count->getFullyQualifiedName()).str()));
+        Ctx.buffer((Twine(getDeclKindStr(Node->getDeclKind())) + " " +
+          Node->getAnnotateComment(NodeAnnotation::RenameNewName)).str()));
     return;
   }
   default: