Make helper functions static.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136679 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp
index 3b44702fa1d7c0fd798412ac66f55a25927c8b56..c8052e3d79e10ecae4c5680c9baa32ed80c7c0cb 100644 (file)
--- a/lib/ARCMigrate/ARCMT.cpp
+++ b/lib/ARCMigrate/ARCMT.cpp
@@ -176,7 +176,8 @@ static bool HasARCRuntime(CompilerInvocation &origCI) {
   return false;
 }
 
-CompilerInvocation *createInvocationForMigration(CompilerInvocation &origCI) {
+static CompilerInvocation *
+createInvocationForMigration(CompilerInvocation &origCI) {
   llvm::OwningPtr<CompilerInvocation> CInvok;
   CInvok.reset(new CompilerInvocation(origCI));
   CInvok->getPreprocessorOpts().ImplicitPCHInclude = std::string();
@@ -193,9 +194,9 @@ CompilerInvocation *createInvocationForMigration(CompilerInvocation &origCI) {
   return CInvok.take();
 }
 
-void emitPremigrationErrors(const CapturedDiagList &arcDiags,
-                            const DiagnosticOptions &diagOpts,
-                            Preprocessor &PP) {
+static void emitPremigrationErrors(const CapturedDiagList &arcDiags,
+                                   const DiagnosticOptions &diagOpts,
+                                   Preprocessor &PP) {
   TextDiagnosticPrinter printer(llvm::errs(), diagOpts);
   llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
   llvm::IntrusiveRefCntPtr<Diagnostic> Diags(

diff --git a/lib/Analysis/LiveVariables.cpp b/lib/Analysis/LiveVariables.cpp
index f81019e2c9f02fb056e52c597204aaf59aee4c49..c6c091e12959e61fe0023c5319150f7473469e75 100644 (file)
--- a/lib/Analysis/LiveVariables.cpp
+++ b/lib/Analysis/LiveVariables.cpp
@@ -433,10 +433,11 @@ LiveVariables::computeLiveness(AnalysisContext &AC,
   return new LiveVariables(LV);
 }
 
-bool compare_entries(const CFGBlock *A, const CFGBlock *B) {
+static bool compare_entries(const CFGBlock *A, const CFGBlock *B) {
   return A->getBlockID() < B->getBlockID();
 }
-bool compare_vd_entries(const Decl *A, const Decl *B) {
+
+static bool compare_vd_entries(const Decl *A, const Decl *B) {
   SourceLocation ALoc = A->getLocStart();
   SourceLocation BLoc = B->getLocStart();
   return ALoc.getRawEncoding() < BLoc.getRawEncoding();

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index 0f02ed31df2149fdbcb4ddaf9c6c001794d2d392..9fbd73f4b63b948137ba2f2e07fd5a8d3a21ea89 100644 (file)
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -237,10 +237,10 @@ static bool checkAttributeNumArgsPlusParams(Sema &S, const AttributeList &Attr,
 /// \brief Check if passed in Decl is a field or potentially shared global var
 /// \return true if the Decl is a field or potentially shared global variable
 ///
-static bool mayBeSharedVariable(Decl *D) {
+static bool mayBeSharedVariable(const Decl *D) {
   if (isa<FieldDecl>(D))
     return true;
-  if(VarDecl *vd = dyn_cast<VarDecl>(D))
+  if (const VarDecl *vd = dyn_cast<VarDecl>(D))
     return (vd->hasGlobalStorage() && !(vd->isThreadSpecified()));
 
   return false;
@@ -251,12 +251,11 @@ static bool mayBeSharedVariable(Decl *D) {
 /// Note that this function may produce an error message.
 /// \return true if the Decl is a pointer type; false otherwise
 ///
-bool checkIsPointer(Sema & S, Decl * D, const AttributeList & Attr) {
-  if(ValueDecl * vd = dyn_cast <ValueDecl>(D)) {
+static bool checkIsPointer(Sema &S, const Decl *D, const AttributeList &Attr) {
+  if (const ValueDecl *vd = dyn_cast<ValueDecl>(D)) {
     QualType QT = vd->getType();
-    if(QT->isAnyPointerType()) {
+    if (QT->isAnyPointerType())
       return true;
-    }
     S.Diag(Attr.getLoc(), diag::warn_pointer_attribute_wrong_type)
       << Attr.getName()->getName() << QT;
   } else {