[llvm-commits] [parallel] CVS: llvm/tools/llvm-prof/Makefile llvm-prof.cpp ProfileInfo.cpp ProfileInfo.h

[Misha Brukman]

Changes in directory llvm/tools/llvm-prof:

Makefile updated: 1.1 -> 1.1.4.1
llvm-prof.cpp updated: 1.16 -> 1.16.4.1
ProfileInfo.cpp (r1.6) removed
ProfileInfo.h (r1.5) removed

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+5 -4)

Index: llvm/tools/llvm-prof/Makefile
diff -u llvm/tools/llvm-prof/Makefile:1.1 llvm/tools/llvm-prof/Makefile:1.1.4.1
--- llvm/tools/llvm-prof/Makefile:1.1	Tue Oct 28 13:16:35 2003
+++ llvm/tools/llvm-prof/Makefile	Mon Mar  1 17:59:18 2004
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-prof
-USEDLIBS = bcreader vmcore support.a
+USEDLIBS = analysis.a bcreader vmcore support.a
 include $(LEVEL)/Makefile.common


Index: llvm/tools/llvm-prof/llvm-prof.cpp
diff -u llvm/tools/llvm-prof/llvm-prof.cpp:1.16 llvm/tools/llvm-prof/llvm-prof.cpp:1.16.4.1
--- llvm/tools/llvm-prof/llvm-prof.cpp:1.16	Tue Nov 11 16:41:34 2003
+++ llvm/tools/llvm-prof/llvm-prof.cpp	Mon Mar  1 17:59:18 2004
@@ -13,12 +13,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ProfileInfo.h"
 #include "llvm/Module.h"
 #include "llvm/Assembly/AsmAnnotationWriter.h"
+#include "llvm/Analysis/ProfileInfoLoader.h"
 #include "llvm/Bytecode/Reader.h"
 #include "Support/CommandLine.h"
-#include <iostream>
+#include "Support/Signals.h"
 #include <cstdio>
 #include <map>
 #include <set>
@@ -81,6 +81,7 @@
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm profile dump decoder\n");
+  PrintStackTraceOnErrorSignal();
 
   // Read in the bytecode file...
   std::string ErrorMessage;
@@ -92,7 +93,7 @@
   }
 
   // Read the profiling information
-  ProfileInfo PI(argv[0], ProfileDataFile, *M);
+  ProfileInfoLoader PI(argv[0], ProfileDataFile, *M);
 
   std::map<const Function  *, unsigned> FuncFreqs;
   std::map<const BasicBlock*, unsigned> BlockFreqs;