summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2015-02-15 23:40:18 +0000
committerDavid Blaikie <dblaikie@gmail.com>2015-02-15 23:40:18 +0000
commitc4d7bc3fccf6cb9f20e29794245a63e9965a4596 (patch)
tree34c35549119ea650e015386e7d50585837b95a0c
parentda9d3879294e1f12014d6f9394830584e4091ea7 (diff)
downloadbcm5719-llvm-c4d7bc3fccf6cb9f20e29794245a63e9965a4596.tar.gz
bcm5719-llvm-c4d7bc3fccf6cb9f20e29794245a63e9965a4596.zip
Update Polly for the removal of LLVM_DELETED_FUNCTION now that '= delete' works on all supported compilers (MSVC2012 compat has been dropped)
llvm-svn: 229344
-rw-r--r--polly/include/polly/ScopDetection.h4
-rw-r--r--polly/include/polly/ScopInfo.h16
-rw-r--r--polly/include/polly/TempScopInfo.h4
-rw-r--r--polly/lib/Transform/Canonicalization.cpp4
-rw-r--r--polly/lib/Transform/CodePreparation.cpp4
5 files changed, 16 insertions, 16 deletions
diff --git a/polly/include/polly/ScopDetection.h b/polly/include/polly/ScopDetection.h
index 2588f5cf749..b4c1de09ea1 100644
--- a/polly/include/polly/ScopDetection.h
+++ b/polly/include/polly/ScopDetection.h
@@ -125,8 +125,8 @@ public:
private:
//===--------------------------------------------------------------------===//
- ScopDetection(const ScopDetection &) LLVM_DELETED_FUNCTION;
- const ScopDetection &operator=(const ScopDetection &) LLVM_DELETED_FUNCTION;
+ ScopDetection(const ScopDetection &) = delete;
+ const ScopDetection &operator=(const ScopDetection &) = delete;
/// @brief Analysis passes used.
//@{
diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index d8324e2e6da..043ce1edea5 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -162,8 +162,8 @@ public:
};
private:
- MemoryAccess(const MemoryAccess &) LLVM_DELETED_FUNCTION;
- const MemoryAccess &operator=(const MemoryAccess &) LLVM_DELETED_FUNCTION;
+ MemoryAccess(const MemoryAccess &) = delete;
+ const MemoryAccess &operator=(const MemoryAccess &) = delete;
isl_map *AccessRelation;
enum AccessType AccType;
@@ -355,8 +355,8 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
/// At the moment every statement represents a single basic block of LLVM-IR.
class ScopStmt {
//===-------------------------------------------------------------------===//
- ScopStmt(const ScopStmt &) LLVM_DELETED_FUNCTION;
- const ScopStmt &operator=(const ScopStmt &) LLVM_DELETED_FUNCTION;
+ ScopStmt(const ScopStmt &) = delete;
+ const ScopStmt &operator=(const ScopStmt &) = delete;
/// Polyhedral description
//@{
@@ -628,8 +628,8 @@ public:
using MinMaxVectorVectorTy = SmallVector<MinMaxVectorTy *, 4>;
private:
- Scop(const Scop &) LLVM_DELETED_FUNCTION;
- const Scop &operator=(const Scop &) LLVM_DELETED_FUNCTION;
+ Scop(const Scop &) = delete;
+ const Scop &operator=(const Scop &) = delete;
ScalarEvolution *SE;
@@ -940,8 +940,8 @@ static inline raw_ostream &operator<<(raw_ostream &O, const Scop &scop) {
///
class ScopInfo : public RegionPass {
//===-------------------------------------------------------------------===//
- ScopInfo(const ScopInfo &) LLVM_DELETED_FUNCTION;
- const ScopInfo &operator=(const ScopInfo &) LLVM_DELETED_FUNCTION;
+ ScopInfo(const ScopInfo &) = delete;
+ const ScopInfo &operator=(const ScopInfo &) = delete;
// The Scop
Scop *scop;
diff --git a/polly/include/polly/TempScopInfo.h b/polly/include/polly/TempScopInfo.h
index c58b521be52..fd73053eedb 100644
--- a/polly/include/polly/TempScopInfo.h
+++ b/polly/include/polly/TempScopInfo.h
@@ -199,8 +199,8 @@ typedef std::map<const Region *, TempScop *> TempScopMapType;
///
class TempScopInfo : public FunctionPass {
//===-------------------------------------------------------------------===//
- TempScopInfo(const TempScopInfo &) LLVM_DELETED_FUNCTION;
- const TempScopInfo &operator=(const TempScopInfo &) LLVM_DELETED_FUNCTION;
+ TempScopInfo(const TempScopInfo &) = delete;
+ const TempScopInfo &operator=(const TempScopInfo &) = delete;
// The ScalarEvolution to help building Scop.
ScalarEvolution *SE;
diff --git a/polly/lib/Transform/Canonicalization.cpp b/polly/lib/Transform/Canonicalization.cpp
index 8b49571fa24..8c60257dd3f 100644
--- a/polly/lib/Transform/Canonicalization.cpp
+++ b/polly/lib/Transform/Canonicalization.cpp
@@ -34,9 +34,9 @@ void polly::registerCanonicalicationPasses(llvm::legacy::PassManagerBase &PM) {
namespace {
class PollyCanonicalize : public ModulePass {
- PollyCanonicalize(const PollyCanonicalize &) LLVM_DELETED_FUNCTION;
+ PollyCanonicalize(const PollyCanonicalize &) = delete;
const PollyCanonicalize &
- operator=(const PollyCanonicalize &) LLVM_DELETED_FUNCTION;
+ operator=(const PollyCanonicalize &) = delete;
public:
static char ID;
diff --git a/polly/lib/Transform/CodePreparation.cpp b/polly/lib/Transform/CodePreparation.cpp
index 5aba77e7662..a7701714e88 100644
--- a/polly/lib/Transform/CodePreparation.cpp
+++ b/polly/lib/Transform/CodePreparation.cpp
@@ -65,9 +65,9 @@ static void DemotePHI(
/// @brief Prepare the IR for the scop detection.
///
class CodePreparation : public FunctionPass {
- CodePreparation(const CodePreparation &) LLVM_DELETED_FUNCTION;
+ CodePreparation(const CodePreparation &) = delete;
const CodePreparation &
- operator=(const CodePreparation &) LLVM_DELETED_FUNCTION;
+ operator=(const CodePreparation &) = delete;
LoopInfo *LI;
ScalarEvolution *SE;
OpenPOWER on IntegriCloud