Merge pull request #1969 from jpsim/unused-param-printAnnotatedDeclaration

swift-ci · swift-ci · commit 5701926d5ac8 · 2016-04-09T14:21:46.000-07:00
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
@@ -397,7 +397,7 @@ static Type findBaseTypeForReplacingArchetype(const ValueDecl *VD, const Type Ty
   return Result;
 }
 
-static void printAnnotatedDeclaration(const ValueDecl *VD, const Type Ty,
+static void printAnnotatedDeclaration(const ValueDecl *VD,
                                       const Type BaseTy,
                                       raw_ostream &OS) {
   AnnotatedDeclarationPrinter Printer(OS);
@@ -676,7 +676,7 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
   unsigned DeclBegin = SS.size();
   {
     llvm::raw_svector_ostream OS(SS);
-    printAnnotatedDeclaration(VD, Ty, BaseType, OS);
+    printAnnotatedDeclaration(VD, BaseType, OS);
   }
   unsigned DeclEnd = SS.size();
 

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ static Type findBaseTypeForReplacingArchetype(const ValueDecl *VD, const Type Ty`
`397`	`397`	`return Result;`
`398`	`398`	`}`
`399`	`399`
`400`		`-static void printAnnotatedDeclaration(const ValueDecl *VD, const Type Ty,`
	`400`	`+static void printAnnotatedDeclaration(const ValueDecl *VD,`
`401`	`401`	`const Type BaseTy,`
`402`	`402`	`raw_ostream &OS) {`
`403`	`403`	`AnnotatedDeclarationPrinter Printer(OS);`
`@@ -676,7 +676,7 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,`
`676`	`676`	`unsigned DeclBegin = SS.size();`
`677`	`677`	`{`
`678`	`678`	`llvm::raw_svector_ostream OS(SS);`
`679`		`- printAnnotatedDeclaration(VD, Ty, BaseType, OS);`
	`679`	`+ printAnnotatedDeclaration(VD, BaseType, OS);`
`680`	`680`	`}`
`681`	`681`	`unsigned DeclEnd = SS.size();`
`682`	`682`