Apply feed back from Chris:

  1. Rename createLoaderPass to CreateProfileLoaderPass
  2. Opt shouldn't use the pass registered in CodeGen.

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

diff --git a/include/llvm/Analysis/Passes.h b/include/llvm/Analysis/Passes.h
index 47e1e72558d9bdbf8ddb6235a952134eb2b234bd..771ac11019de1bc1eaa2f43b36d58d33dd48c2cc 100644 (file)
--- a/include/llvm/Analysis/Passes.h
+++ b/include/llvm/Analysis/Passes.h
@@ -71,9 +71,10 @@ namespace llvm {
  
   //===--------------------------------------------------------------------===//
   //
-  // createLoaderPass - This pass loads information from a profile dump file.
+  // createProfileLoaderPass - This pass loads information from a profile dump
+  // file.
   //
-  ModulePass *createLoaderPass();
+  ModulePass *createProfileLoaderPass();
  
   //===--------------------------------------------------------------------===//
   //

diff --git a/include/llvm/Transforms/LinkAllPasses.h b/include/llvm/Transforms/LinkAllPasses.h
index b5d67f73ba5c1358e8ae3bb19f8772e9bdb2d670..fb286c0e0b32e2ddb2f3fcbbc6518bace5ddbfa1 100644 (file)
--- a/include/llvm/Transforms/LinkAllPasses.h
+++ b/include/llvm/Transforms/LinkAllPasses.h
@@ -79,7 +79,6 @@ namespace {
       (void) llvm::createInternalizePass();
       (void) llvm::createLICMPass();
       (void) llvm::createLoadValueNumberingPass();
-      (void) llvm::createLoaderPass();
       (void) llvm::createLoopExtractorPass();
       (void) llvm::createLoopInstrumentationPass();
       (void) llvm::createLoopSimplifyPass();
@@ -98,6 +97,7 @@ namespace {
       (void) llvm::createNoProfileInfoPass();
       (void) llvm::createPREPass();
       (void) llvm::createParallelizePass();
+      (void) llvm::createProfileLoaderPass();
       (void) llvm::createProfilePathsPass();
       (void) llvm::createPromoteMemoryToRegister();
       (void) llvm::createPruneEHPass();
@@ -115,7 +115,6 @@ namespace {
       (void) llvm::createTraceValuesPassForBasicBlocks();
       (void) llvm::createTraceValuesPassForFunction();
       (void) llvm::createUnifyFunctionExitNodesPass();
-      (void) llvm::createUnreachableBlockEliminationPass();
     }
   } _ForcePassLinking;
 };

diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index 5a57c54f1ec7cf4fd3d173deae1e6094a0ee81ce..b76c34a8bb833770753d2ee5c0e5ffd48a719e92 100644 (file)
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -55,7 +55,7 @@ namespace {
   RegisterAnalysisGroup<ProfileInfo, LoaderPass> Y;
 }  // End of anonymous namespace
 
-ModulePass *llvm::createLoaderPass() { return new LoaderPass(); }
+ModulePass *llvm::createProfileLoaderPass() { return new LoaderPass(); }
 
 /// createProfileLoaderPass - This function returns a Pass that loads the
 /// profiling information for the module from the specified filename, making it

diff --git a/win32/llvm.sln b/win32/llvm.sln
index 770d542c540f7d6fa0e13723319176a3cab9e196..df24ada781a744b7bafe1d8916e3a88061399f95 100644 (file)
--- a/win32/llvm.sln
+++ b/win32/llvm.sln
@@ -170,7 +170,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opt", "opt\opt.vcproj", "{0
                {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}
                {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61}
                {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}
-               {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}
                {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99}
                {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
                {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}