diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h index 101b6547a02..5efdde9a69c 100644 --- a/include/llvm/Analysis/DataStructure/DSGraph.h +++ b/include/llvm/Analysis/DataStructure/DSGraph.h @@ -16,6 +16,7 @@ #define LLVM_ANALYSIS_DSGRAPH_H #include "llvm/Analysis/DataStructure/DSNode.h" +#include "llvm/ADT/hash_map" namespace llvm { @@ -97,7 +98,8 @@ public: //===----------------------------------------------------------------------===// /// DSGraph - The graph that represents a function. /// -struct DSGraph { +class DSGraph { +public: // Public data-type declarations... typedef DSScalarMap ScalarMapTy; typedef hash_map ReturnNodesTy; diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h index 3cdc0a6420e..8dc39fb73cb 100644 --- a/include/llvm/Analysis/DataStructure/DSNode.h +++ b/include/llvm/Analysis/DataStructure/DSNode.h @@ -15,6 +15,7 @@ #define LLVM_ANALYSIS_DSNODE_H #include "llvm/Analysis/DataStructure/DSSupport.h" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h index 6dbd36b4444..07fe159781c 100644 --- a/include/llvm/Analysis/DataStructure/DSSupport.h +++ b/include/llvm/Analysis/DataStructure/DSSupport.h @@ -15,6 +15,7 @@ #define LLVM_ANALYSIS_DSSUPPORT_H #include +#include "llvm/ADT/hash_map" #include "llvm/ADT/hash_set" #include "llvm/Support/CallSite.h" diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h index 34575a2db8a..627c7c4d7b4 100644 --- a/include/llvm/Analysis/DataStructure/DataStructure.h +++ b/include/llvm/Analysis/DataStructure/DataStructure.h @@ -16,6 +16,7 @@ #include "llvm/Pass.h" #include "llvm/Target/TargetData.h" +#include "llvm/ADT/hash_map" #include "llvm/ADT/hash_set" namespace llvm { diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp index 51485dab891..9a65c488bff 100644 --- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp +++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp @@ -49,7 +49,8 @@ namespace llvm { /// not copied over from one table to another since it is no longer useful. ///-------------------------------------------------------------------------- -struct ModRefTable { +class ModRefTable { +public: typedef hash_map ModRefMap; typedef ModRefMap::const_iterator const_map_iterator; typedef ModRefMap:: iterator map_iterator; diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj index 0b129f9d0ba..6293130ad5d 100644 --- a/win32/Analysis/Analysis.vcproj +++ b/win32/Analysis/Analysis.vcproj @@ -188,6 +188,73 @@ RelativePath="..\..\lib\Analysis\Ipa\PrintSCC.cpp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +