projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[LPM] A targeted but somewhat horrible fix to the legacy pass manager's
[oota-llvm.git]
/
include
/
llvm
/
PassAnalysisSupport.h
diff --git
a/include/llvm/PassAnalysisSupport.h
b/include/llvm/PassAnalysisSupport.h
index 977d4f4e30d32894c5b8159f23f8259914cf566c..9164305418092385d0613c3ca238ca014ca7397f 100644
(file)
--- a/
include/llvm/PassAnalysisSupport.h
+++ b/
include/llvm/PassAnalysisSupport.h
@@
-16,12
+16,12
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_PASS
_ANALYSIS_
SUPPORT_H
-#define LLVM_PASS
_ANALYSIS_
SUPPORT_H
+#ifndef LLVM_PASS
ANALYSIS
SUPPORT_H
+#define LLVM_PASS
ANALYSIS
SUPPORT_H
-#include "llvm/Pass.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/Pass.h"
#include <vector>
namespace llvm {
#include <vector>
namespace llvm {
@@
-49,34
+49,37
@@
public:
// addRequired - Add the specified ID to the required set of the usage info
// for a pass.
//
// addRequired - Add the specified ID to the required set of the usage info
// for a pass.
//
- AnalysisUsage &addRequiredID(AnalysisID ID);
+ AnalysisUsage &addRequiredID(const void *ID);
+ AnalysisUsage &addRequiredID(char &ID);
template<class PassClass>
AnalysisUsage &addRequired() {
template<class PassClass>
AnalysisUsage &addRequired() {
- return addRequiredID(Pass
::getClassPassInfo<PassClass>()
);
+ return addRequiredID(Pass
Class::ID
);
}
}
- AnalysisUsage &addRequiredTransitiveID(
AnalysisID
ID);
+ AnalysisUsage &addRequiredTransitiveID(
char &
ID);
template<class PassClass>
AnalysisUsage &addRequiredTransitive() {
template<class PassClass>
AnalysisUsage &addRequiredTransitive() {
- AnalysisID ID = Pass::getClassPassInfo<PassClass>();
- return addRequiredTransitiveID(ID);
+ return addRequiredTransitiveID(PassClass::ID);
}
// addPreserved - Add the specified ID to the set of analyses preserved by
// this pass
//
}
// addPreserved - Add the specified ID to the set of analyses preserved by
// this pass
//
- AnalysisUsage &addPreservedID(
AnalysisID
ID) {
+ AnalysisUsage &addPreservedID(
const void *
ID) {
Preserved.push_back(ID);
return *this;
}
Preserved.push_back(ID);
return *this;
}
+ AnalysisUsage &addPreservedID(char &ID) {
+ Preserved.push_back(&ID);
+ return *this;
+ }
// addPreserved - Add the specified Pass class to the set of analyses
// preserved by this pass.
//
template<class PassClass>
AnalysisUsage &addPreserved() {
// addPreserved - Add the specified Pass class to the set of analyses
// preserved by this pass.
//
template<class PassClass>
AnalysisUsage &addPreserved() {
- assert(Pass::getClassPassInfo<PassClass>() && "Pass class not registered!");
- Preserved.push_back(Pass::getClassPassInfo<PassClass>());
+ Preserved.push_back(&PassClass::ID);
return *this;
}
return *this;
}
@@
-85,12
+88,7
@@
public:
// This can be useful when a pass is trivially preserved, but may not be
// linked in. Be careful about spelling!
//
// This can be useful when a pass is trivially preserved, but may not be
// linked in. Be careful about spelling!
//
- AnalysisUsage &addPreserved(StringRef Arg) {
- const PassInfo *PI = Pass::lookupPassInfo(Arg);
- // If the pass exists, preserve it. Otherwise silently do nothing.
- if (PI) Preserved.push_back(PI);
- return *this;
- }
+ AnalysisUsage &addPreserved(StringRef Arg);
// setPreservesAll - Set by analyses that do not transform their input at all
void setPreservesAll() { PreservesAll = true; }
// setPreservesAll - Set by analyses that do not transform their input at all
void setPreservesAll() { PreservesAll = true; }
@@
-122,7
+120,7
@@
public:
class PMDataManager;
class AnalysisResolver {
private:
class PMDataManager;
class AnalysisResolver {
private:
- AnalysisResolver()
; // DO NOT IMPLEMENT
+ AnalysisResolver()
LLVM_DELETED_FUNCTION;
public:
explicit AnalysisResolver(PMDataManager &P) : PM(P) { }
public:
explicit AnalysisResolver(PMDataManager &P) : PM(P) { }
@@
-130,8
+128,8
@@
public:
inline PMDataManager &getPMDataManager() { return PM; }
// Find pass that is implementing PI.
inline PMDataManager &getPMDataManager() { return PM; }
// Find pass that is implementing PI.
- Pass *findImplPass(
const PassInfo *
PI) {
- Pass *ResultPass =
0
;
+ Pass *findImplPass(
AnalysisID
PI) {
+ Pass *ResultPass =
nullptr
;
for (unsigned i = 0; i < AnalysisImpls.size() ; ++i) {
if (AnalysisImpls[i].first == PI) {
ResultPass = AnalysisImpls[i].second;
for (unsigned i = 0; i < AnalysisImpls.size() ; ++i) {
if (AnalysisImpls[i].first == PI) {
ResultPass = AnalysisImpls[i].second;
@@
-142,10
+140,12
@@
public:
}
// Find pass that is implementing PI. Initialize pass for Function F.
}
// Find pass that is implementing PI. Initialize pass for Function F.
- Pass *findImplPass(Pass *P,
const PassInfo *
PI, Function &F);
+ Pass *findImplPass(Pass *P,
AnalysisID
PI, Function &F);
- void addAnalysisImplsPair(const PassInfo *PI, Pass *P) {
- std::pair<const PassInfo*, Pass*> pir = std::make_pair(PI,P);
+ void addAnalysisImplsPair(AnalysisID PI, Pass *P) {
+ if (findImplPass(PI) == P)
+ return;
+ std::pair<AnalysisID, Pass*> pir = std::make_pair(PI,P);
AnalysisImpls.push_back(pir);
}
AnalysisImpls.push_back(pir);
}
@@
-158,11
+158,11
@@
public:
// getAnalysisIfAvailable - Return analysis result or null if it doesn't exist
Pass *getAnalysisIfAvailable(AnalysisID ID, bool Direction) const;
// getAnalysisIfAvailable - Return analysis result or null if it doesn't exist
Pass *getAnalysisIfAvailable(AnalysisID ID, bool Direction) const;
+private:
// AnalysisImpls - This keeps track of which passes implements the interfaces
// that are required by the current pass (to implement getAnalysis()).
// AnalysisImpls - This keeps track of which passes implements the interfaces
// that are required by the current pass (to implement getAnalysis()).
- std::vector<std::pair<
const PassInfo*
, Pass*> > AnalysisImpls;
+ std::vector<std::pair<
AnalysisID
, Pass*> > AnalysisImpls;
-private:
// PassManager that is used to resolve analysis info
PMDataManager &PM;
};
// PassManager that is used to resolve analysis info
PMDataManager &PM;
};
@@
-179,11
+179,10
@@
template<typename AnalysisType>
AnalysisType *Pass::getAnalysisIfAvailable() const {
assert(Resolver && "Pass not resident in a PassManager object!");
AnalysisType *Pass::getAnalysisIfAvailable() const {
assert(Resolver && "Pass not resident in a PassManager object!");
- const PassInfo *PI = getClassPassInfo<AnalysisType>();
- if (PI == 0) return 0;
+ const void *PI = &AnalysisType::ID;
Pass *ResultPass = Resolver->getAnalysisIfAvailable(PI, true);
Pass *ResultPass = Resolver->getAnalysisIfAvailable(PI, true);
- if (
ResultPass == 0) return 0
;
+ if (
!ResultPass) return nullptr
;
// Because the AnalysisType may not be a subclass of pass (for
// AnalysisGroups), we use getAdjustedAnalysisPointer here to potentially
// Because the AnalysisType may not be a subclass of pass (for
// AnalysisGroups), we use getAdjustedAnalysisPointer here to potentially
@@
-199,11
+198,11
@@
AnalysisType *Pass::getAnalysisIfAvailable() const {
template<typename AnalysisType>
AnalysisType &Pass::getAnalysis() const {
assert(Resolver && "Pass has not been inserted into a PassManager object!");
template<typename AnalysisType>
AnalysisType &Pass::getAnalysis() const {
assert(Resolver && "Pass has not been inserted into a PassManager object!");
- return getAnalysisID<AnalysisType>(
getClassPassInfo<AnalysisType>()
);
+ return getAnalysisID<AnalysisType>(
&AnalysisType::ID
);
}
template<typename AnalysisType>
}
template<typename AnalysisType>
-AnalysisType &Pass::getAnalysisID(
const PassInfo *
PI) const {
+AnalysisType &Pass::getAnalysisID(
AnalysisID
PI) const {
assert(PI && "getAnalysis for unregistered pass!");
assert(Resolver&&"Pass has not been inserted into a PassManager object!");
// PI *must* appear in AnalysisImpls. Because the number of passes used
assert(PI && "getAnalysis for unregistered pass!");
assert(Resolver&&"Pass has not been inserted into a PassManager object!");
// PI *must* appear in AnalysisImpls. Because the number of passes used
@@
-229,11
+228,11
@@
template<typename AnalysisType>
AnalysisType &Pass::getAnalysis(Function &F) {
assert(Resolver &&"Pass has not been inserted into a PassManager object!");
AnalysisType &Pass::getAnalysis(Function &F) {
assert(Resolver &&"Pass has not been inserted into a PassManager object!");
- return getAnalysisID<AnalysisType>(
getClassPassInfo<AnalysisType>()
, F);
+ return getAnalysisID<AnalysisType>(
&AnalysisType::ID
, F);
}
template<typename AnalysisType>
}
template<typename AnalysisType>
-AnalysisType &Pass::getAnalysisID(
const PassInfo *
PI, Function &F) {
+AnalysisType &Pass::getAnalysisID(
AnalysisID
PI, Function &F) {
assert(PI && "getAnalysis for unregistered pass!");
assert(Resolver && "Pass has not been inserted into a PassManager object!");
// PI *must* appear in AnalysisImpls. Because the number of passes used
assert(PI && "getAnalysis for unregistered pass!");
assert(Resolver && "Pass has not been inserted into a PassManager object!");
// PI *must* appear in AnalysisImpls. Because the number of passes used