Adjust to clang-format changes
git-svn-id: https://llvm.org/svn/llvm-project/polly/trunk@328005 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/polly/CodeGen/CodeGeneration.h b/include/polly/CodeGen/CodeGeneration.h
index 1dc224e..bd1b826 100644
--- a/include/polly/CodeGen/CodeGeneration.h
+++ b/include/polly/CodeGen/CodeGeneration.h
@@ -18,7 +18,6 @@
namespace llvm {
class BasicBlock;
-
} // namespace llvm
namespace polly {
@@ -44,7 +43,6 @@
};
extern bool PerfMonitoring;
-
} // namespace polly
#endif // POLLY_CODEGENERATION_H
diff --git a/include/polly/CodeGen/IslAst.h b/include/polly/CodeGen/IslAst.h
index c1d3305..48ae3ff 100644
--- a/include/polly/CodeGen/IslAst.h
+++ b/include/polly/CodeGen/IslAst.h
@@ -36,7 +36,6 @@
class raw_ostream;
void initializeIslAstInfoWrapperPassPass(PassRegistry &);
-
} // namespace llvm
struct isl_ast_build;
@@ -230,7 +229,6 @@
raw_ostream &OS;
};
-
} // namespace polly
#endif // POLLY_ISLAST_H
diff --git a/include/polly/CodeGen/IslNodeBuilder.h b/include/polly/CodeGen/IslNodeBuilder.h
index cae93ee..6c6a483 100644
--- a/include/polly/CodeGen/IslNodeBuilder.h
+++ b/include/polly/CodeGen/IslNodeBuilder.h
@@ -46,7 +46,6 @@
class SCEV;
class Type;
class Value;
-
} // namespace llvm
namespace polly {
@@ -55,7 +54,6 @@
class MemoryAccess;
class Scop;
class ScopStmt;
-
} // namespace polly
struct isl_ast_node;
diff --git a/include/polly/CodeGen/Utils.h b/include/polly/CodeGen/Utils.h
index 9bce03d..0452c44 100644
--- a/include/polly/CodeGen/Utils.h
+++ b/include/polly/CodeGen/Utils.h
@@ -69,6 +69,5 @@
std::pair<BBPair, llvm::BranchInst *>
executeScopConditionally(Scop &S, llvm::Value *RTC, llvm::DominatorTree &DT,
llvm::RegionInfo &RI, llvm::LoopInfo &LI);
-
} // namespace polly
#endif
diff --git a/include/polly/DependenceInfo.h b/include/polly/DependenceInfo.h
index 89c3205..38e4c95 100644
--- a/include/polly/DependenceInfo.h
+++ b/include/polly/DependenceInfo.h
@@ -310,7 +310,6 @@
/// Scop to Dependence map for the current function.
ScopToDepsMapTy ScopToDepsMap;
};
-
} // namespace polly
namespace llvm {
diff --git a/include/polly/ForwardOpTree.h b/include/polly/ForwardOpTree.h
index b0c16ca..3e23be8 100644
--- a/include/polly/ForwardOpTree.h
+++ b/include/polly/ForwardOpTree.h
@@ -19,7 +19,6 @@
class PassRegistry;
void initializeForwardOpTreePass(PassRegistry &);
-
} // namespace llvm
namespace polly {
@@ -27,7 +26,6 @@
class ScopPass;
ScopPass *createForwardOpTreePass();
-
} // namespace polly
#endif // POLLY_FORWARDOPTREE_H
diff --git a/include/polly/PolyhedralInfo.h b/include/polly/PolyhedralInfo.h
index 54d5de9..40c6ea6 100644
--- a/include/polly/PolyhedralInfo.h
+++ b/include/polly/PolyhedralInfo.h
@@ -91,7 +91,6 @@
ScopInfo *SI;
DependenceInfoWrapperPass *DI;
};
-
} // end namespace polly
namespace llvm {
diff --git a/include/polly/PruneUnprofitable.h b/include/polly/PruneUnprofitable.h
index e75220f..6101b7e 100644
--- a/include/polly/PruneUnprofitable.h
+++ b/include/polly/PruneUnprofitable.h
@@ -20,13 +20,11 @@
class PassRegistry;
void initializePruneUnprofitablePass(PassRegistry &);
-
} // namespace llvm
namespace polly {
llvm::Pass *createPruneUnprofitablePass();
-
} // namespace polly
#endif // POLLY_PRUNEUNPROFITABLE_H
diff --git a/include/polly/ScheduleOptimizer.h b/include/polly/ScheduleOptimizer.h
index 079acf1..ef44f34 100644
--- a/include/polly/ScheduleOptimizer.h
+++ b/include/polly/ScheduleOptimizer.h
@@ -16,7 +16,6 @@
namespace llvm {
class TargetTransformInfo;
-
} // namespace llvm
struct isl_schedule_node;
@@ -70,7 +69,6 @@
};
extern bool DisablePollyTiling;
-
} // namespace polly
class ScheduleTreeOptimizer {
diff --git a/include/polly/ScopBuilder.h b/include/polly/ScopBuilder.h
index e1e351c..247e238 100644
--- a/include/polly/ScopBuilder.h
+++ b/include/polly/ScopBuilder.h
@@ -44,7 +44,6 @@
void initializeScopInfoRegionPassPass(PassRegistry &);
void initializeScopInfoWrapperPassPass(PassRegistry &);
-
} // end namespace llvm
namespace polly {
@@ -404,7 +403,6 @@
/// for the region
std::unique_ptr<Scop> getScop() { return std::move(scop); }
};
-
} // end namespace polly
#endif // POLLY_SCOPBUILDER_H
diff --git a/include/polly/ScopDetection.h b/include/polly/ScopDetection.h
index 7e61c06..31d54d8 100644
--- a/include/polly/ScopDetection.h
+++ b/include/polly/ScopDetection.h
@@ -90,7 +90,6 @@
class Value;
void initializeScopDetectionWrapperPassPass(PassRegistry &);
-
} // namespace llvm
namespace polly {
@@ -670,7 +669,6 @@
ScopDetection &getSD() { return *Result; }
const ScopDetection &getSD() const { return *Result; }
};
-
} // namespace polly
#endif // POLLY_SCOPDETECTION_H
diff --git a/include/polly/ScopDetectionDiagnostic.h b/include/polly/ScopDetectionDiagnostic.h
index d5fa238..12f79d1 100644
--- a/include/polly/ScopDetectionDiagnostic.h
+++ b/include/polly/ScopDetectionDiagnostic.h
@@ -42,7 +42,6 @@
class Region;
class SCEV;
class Value;
-
} // namespace llvm
namespace polly {
@@ -830,7 +829,6 @@
std::string getEndUserMessage() const override;
//@}
};
-
} // namespace polly
#endif // POLLY_SCOPDETECTIONDIAGNOSTIC_H
diff --git a/include/polly/ScopInfo.h b/include/polly/ScopInfo.h
index 8f66d05..0fb0876 100644
--- a/include/polly/ScopInfo.h
+++ b/include/polly/ScopInfo.h
@@ -75,7 +75,6 @@
void initializeScopInfoRegionPassPass(PassRegistry &);
void initializeScopInfoWrapperPassPass(PassRegistry &);
-
} // end namespace llvm
struct isl_map;
@@ -3203,7 +3202,6 @@
void getAnalysisUsage(AnalysisUsage &AU) const override;
};
-
} // end namespace polly
#endif // POLLY_SCOPINFO_H
diff --git a/include/polly/ScopPass.h b/include/polly/ScopPass.h
index 5182a1b..4a6bac7 100644
--- a/include/polly/ScopPass.h
+++ b/include/polly/ScopPass.h
@@ -268,7 +268,6 @@
createFunctionToScopPassAdaptor(ScopPassT Pass) {
return FunctionToScopPassAdaptor<ScopPassT>(std::move(Pass));
}
-
} // namespace polly
#endif
diff --git a/include/polly/Support/GICHelper.h b/include/polly/Support/GICHelper.h
index 3c0fe40..5d85320 100644
--- a/include/polly/Support/GICHelper.h
+++ b/include/polly/Support/GICHelper.h
@@ -430,7 +430,6 @@
return isl_ctx_last_error(IslCtx) == isl_error_quota;
}
};
-
} // end namespace polly
#endif
diff --git a/include/polly/Support/ISLOperators.h b/include/polly/Support/ISLOperators.h
index 98ea42c..b6618df 100644
--- a/include/polly/Support/ISLOperators.h
+++ b/include/polly/Support/ISLOperators.h
@@ -115,5 +115,4 @@
isl::ctx ctx = A.get_ctx();
return A % isl::val(ctx, i);
}
-
} // namespace polly
diff --git a/include/polly/Support/ISLTools.h b/include/polly/Support/ISLTools.h
index 0dfb530..25da2a4 100644
--- a/include/polly/Support/ISLTools.h
+++ b/include/polly/Support/ISLTools.h
@@ -522,7 +522,6 @@
void dumpExpanded(__isl_keep isl_union_set *USet);
void dumpExpanded(__isl_keep isl_union_map *UMap);
/// @}
-
} // namespace polly
#endif /* POLLY_ISLTOOLS_H */
diff --git a/include/polly/Support/VirtualInstruction.h b/include/polly/Support/VirtualInstruction.h
index 81d954e..9794d35 100644
--- a/include/polly/Support/VirtualInstruction.h
+++ b/include/polly/Support/VirtualInstruction.h
@@ -307,7 +307,6 @@
DenseSet<VirtualInstruction> &UsedInsts,
DenseSet<MemoryAccess *> &UsedAccs,
ScopStmt *OnlyLocal = nullptr);
-
} // namespace polly
namespace llvm {
diff --git a/lib/Analysis/PruneUnprofitable.cpp b/lib/Analysis/PruneUnprofitable.cpp
index 9dcaa73..262cadd 100644
--- a/lib/Analysis/PruneUnprofitable.cpp
+++ b/lib/Analysis/PruneUnprofitable.cpp
@@ -92,7 +92,6 @@
return false;
}
};
-
} // namespace
char PruneUnprofitable::ID;
diff --git a/lib/Analysis/ScopDetection.cpp b/lib/Analysis/ScopDetection.cpp
index b61ebcb..362580f 100644
--- a/lib/Analysis/ScopDetection.cpp
+++ b/lib/Analysis/ScopDetection.cpp
@@ -304,7 +304,6 @@
return DI->getKind() == PluginDiagnosticKind;
}
};
-
} // namespace
int DiagnosticScopFound::PluginDiagnosticKind =
@@ -854,7 +853,6 @@
private:
std::vector<const SCEV *> *Terms;
};
-
} // namespace
SmallVector<const SCEV *, 4>
diff --git a/lib/Analysis/ScopDetectionDiagnostic.cpp b/lib/Analysis/ScopDetectionDiagnostic.cpp
index 5a8b42d..ac1e751 100644
--- a/lib/Analysis/ScopDetectionDiagnostic.cpp
+++ b/lib/Analysis/ScopDetectionDiagnostic.cpp
@@ -96,7 +96,6 @@
return LHS.concat(Buf).str();
}
-
} // namespace polly
namespace llvm {
@@ -106,7 +105,6 @@
return LHS.getLine() < RHS.getLine() ||
(LHS.getLine() == RHS.getLine() && LHS.getCol() < RHS.getCol());
}
-
} // namespace llvm
namespace polly {
@@ -780,5 +778,4 @@
bool ReportUnprofitable::classof(const RejectReason *RR) {
return RR->getKind() == RejectReasonKind::Unprofitable;
}
-
} // namespace polly
diff --git a/lib/Analysis/ScopGraphPrinter.cpp b/lib/Analysis/ScopGraphPrinter.cpp
index fd4e65f..3908694 100644
--- a/lib/Analysis/ScopGraphPrinter.cpp
+++ b/lib/Analysis/ScopGraphPrinter.cpp
@@ -197,7 +197,6 @@
O, 4);
}
};
-
} // end namespace llvm
struct ScopViewer
diff --git a/lib/Analysis/ScopInfo.cpp b/lib/Analysis/ScopInfo.cpp
index e68551b..f5127ef 100644
--- a/lib/Analysis/ScopInfo.cpp
+++ b/lib/Analysis/ScopInfo.cpp
@@ -1926,7 +1926,6 @@
bool isDone() { return FoundInside; }
};
-
} // end anonymous namespace
const SCEV *Scop::getRepresentingInvariantLoadSCEV(const SCEV *E) const {
diff --git a/lib/CodeGen/CodeGeneration.cpp b/lib/CodeGen/CodeGeneration.cpp
index 41a3b2f..d7e6c43 100644
--- a/lib/CodeGen/CodeGeneration.cpp
+++ b/lib/CodeGen/CodeGeneration.cpp
@@ -94,7 +94,6 @@
Builder.CreateUnreachable();
OrigTerminator->eraseFromParent();
}
-
} // namespace polly
static void verifyGeneratedFunction(Scop &S, Function &F, IslAstInfo &AI) {
@@ -369,7 +368,6 @@
// region tree.
}
};
-
} // namespace
PreservedAnalyses CodeGenerationPass::run(Scop &S, ScopAnalysisManager &SAM,
diff --git a/lib/CodeGen/IslAst.cpp b/lib/CodeGen/IslAst.cpp
index 442411b..23767cf 100644
--- a/lib/CodeGen/IslAst.cpp
+++ b/lib/CodeGen/IslAst.cpp
@@ -122,7 +122,6 @@
/// The last iterator id created for the current SCoP.
isl_id *LastForNodeId = nullptr;
};
-
} // namespace polly
/// Free an IslAstUserPayload object pointed to by @p Ptr.
diff --git a/lib/CodeGen/ManagedMemoryRewrite.cpp b/lib/CodeGen/ManagedMemoryRewrite.cpp
index 2ebe9e0..a824014 100644
--- a/lib/CodeGen/ManagedMemoryRewrite.cpp
+++ b/lib/CodeGen/ManagedMemoryRewrite.cpp
@@ -413,7 +413,6 @@
return true;
}
};
-
} // namespace
char ManagedMemoryRewritePass::ID = 42;
diff --git a/lib/Transform/ForwardOpTree.cpp b/lib/Transform/ForwardOpTree.cpp
index dbdf8fc..0cb8a30 100644
--- a/lib/Transform/ForwardOpTree.cpp
+++ b/lib/Transform/ForwardOpTree.cpp
@@ -1007,7 +1007,6 @@
}; // class ForwardOpTree
char ForwardOpTree::ID;
-
} // namespace
ScopPass *polly::createForwardOpTreePass() { return new ForwardOpTree(); }
diff --git a/lib/Transform/MaximalStaticExpansion.cpp b/lib/Transform/MaximalStaticExpansion.cpp
index 2a14721..f8856f5 100644
--- a/lib/Transform/MaximalStaticExpansion.cpp
+++ b/lib/Transform/MaximalStaticExpansion.cpp
@@ -112,7 +112,6 @@
void expandPhi(Scop &S, const ScopArrayInfo *SAI,
const isl::union_map &Dependences);
};
-
} // namespace
#ifndef NDEBUG
diff --git a/lib/Transform/ScheduleOptimizer.cpp b/lib/Transform/ScheduleOptimizer.cpp
index 7929a3d..0b302b9 100644
--- a/lib/Transform/ScheduleOptimizer.cpp
+++ b/lib/Transform/ScheduleOptimizer.cpp
@@ -1411,7 +1411,6 @@
private:
isl_schedule *LastSchedule = nullptr;
};
-
} // namespace
char IslScheduleOptimizer::ID = 0;
diff --git a/lib/Transform/ScopInliner.cpp b/lib/Transform/ScopInliner.cpp
index 064e8d3..a78c3e0 100644
--- a/lib/Transform/ScopInliner.cpp
+++ b/lib/Transform/ScopInliner.cpp
@@ -102,7 +102,6 @@
CallGraphSCCPass::getAnalysisUsage(AU);
}
};
-
} // namespace
char ScopInliner::ID;
diff --git a/unittests/Flatten/FlattenTest.cpp b/unittests/Flatten/FlattenTest.cpp
index 0880629..e8e960d 100644
--- a/unittests/Flatten/FlattenTest.cpp
+++ b/unittests/Flatten/FlattenTest.cpp
@@ -66,5 +66,4 @@
"{ A[i] -> [i, 0] : 0 <= i < 10; B[i] -> [i, 1] : 0 <= i < 10 }",
"{ A[i] -> [2i] : 0 <= i < 10; B[i] -> [2i + 1] : 0 <= i < 10 }"));
}
-
} // anonymous namespace
diff --git a/unittests/Isl/IslTest.cpp b/unittests/Isl/IslTest.cpp
index acafe35..4f44f0f 100644
--- a/unittests/Isl/IslTest.cpp
+++ b/unittests/Isl/IslTest.cpp
@@ -1071,5 +1071,4 @@
UMAP("{ DomainRangeA[] -> NewDomainRangeA[];"
"DomainRangeB[] -> NewDomainRangeB[] }")));
}
-
} // anonymous namespace
