Make the getAnalyss<> members const. Using them does NOT modify the Pass object.

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

diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h
index e717b1971caf41b23a35023d673f36e1a47a179d..0f4b56fdbcc5692fc538ebff766b8cd0d276173c 100644 (file)
--- a/include/llvm/Pass.h
+++ b/include/llvm/Pass.h
@@ -126,7 +126,7 @@ protected:
   /// getAnalysisUsage function.
   ///
   template<typename AnalysisType>
-  AnalysisType &getAnalysis() {
+  AnalysisType &getAnalysis() const {
     assert(Resolver && "Pass has not been inserted into a PassManager object!");
     const PassInfo *PI = getClassPassInfo<AnalysisType>();
     assert(PI && "getAnalysis for unregistered pass!");
@@ -143,10 +143,10 @@ protected:
   }
 
   template<typename AnalysisType>
-  AnalysisType &getAnalysisID(const PassInfo *PI) {
+  AnalysisType &getAnalysisID(const PassInfo *PI) const {
     assert(Resolver && "Pass has not been inserted into a PassManager object!");
     assert(PI && "getAnalysis for unregistered pass!");
-    return *(AnalysisType*)Resolver->getAnalysis(PI);
+    return *dynamic_cast<AnalysisType*>(Resolver->getAnalysis(PI));
   }
 
   /// getAnalysisToUpdate<AnalysisType>() - This function is used by subclasses
@@ -156,11 +156,11 @@ protected:
   /// provide the capability to update an analysis that exists.
   ///
   template<typename AnalysisType>
-  AnalysisType *getAnalysisToUpdate() {
+  AnalysisType *getAnalysisToUpdate() const {
     assert(Resolver && "Pass not resident in a PassManager object!");
     const PassInfo *PI = getClassPassInfo<AnalysisType>();
     if (PI == 0) return 0;
-    return (AnalysisType*)Resolver->getAnalysisToUpdate(PI);
+    return dynamic_cast<AnalysisType*>(Resolver->getAnalysisToUpdate(PI));
   }
 
 

diff --git a/include/llvm/PassAnalysisSupport.h b/include/llvm/PassAnalysisSupport.h
index fac8cea545f6cea06d2aec8a30e7b1018efeafc0..490c5bf12c64637068b886669f937d38d29ef9a8 100644 (file)
--- a/include/llvm/PassAnalysisSupport.h
+++ b/include/llvm/PassAnalysisSupport.h
@@ -86,14 +86,14 @@ public:
 struct AnalysisResolver {
   virtual Pass *getAnalysisOrNullUp(AnalysisID ID) const = 0;
   virtual Pass *getAnalysisOrNullDown(AnalysisID ID) const = 0;
-  Pass *getAnalysis(AnalysisID ID) {
+  Pass *getAnalysis(AnalysisID ID) const {
     Pass *Result = getAnalysisOrNullUp(ID);
     assert(Result && "Pass has an incorrect analysis uses set!");
     return Result;
   }
 
   // getAnalysisToUpdate - Return an analysis result or null if it doesn't exist
-  Pass *getAnalysisToUpdate(AnalysisID ID) {
+  Pass *getAnalysisToUpdate(AnalysisID ID) const {
     return getAnalysisOrNullUp(ID);
   }