[llvm-commits] [llvm] r80103 - in /llvm/trunk: include/llvm/Analysis/ProfileInfo.h lib/Analysis/ProfileInfo.cpp

[Dan Gohman]

Author: djg
Date: Wed Aug 26 10:56:38 2009
New Revision: 80103

URL: http://llvm.org/viewvc/llvm-project?rev=80103&view=rev
Log:
Move ProfileInfo::Edge's operator<< out of line. Among other benefits,
this eliminates the ATTRIBUTE_USED, which wasn't being used in a manner
acceptable to some GCC versions, according to the buildbots.

Modified:
    llvm/trunk/include/llvm/Analysis/ProfileInfo.h
    llvm/trunk/lib/Analysis/ProfileInfo.cpp

Modified: llvm/trunk/include/llvm/Analysis/ProfileInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ProfileInfo.h?rev=80103&r1=80102&r2=80103&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Analysis/ProfileInfo.h (original)
+++ llvm/trunk/include/llvm/Analysis/ProfileInfo.h Wed Aug 26 10:56:38 2009
@@ -22,8 +22,6 @@
 #define LLVM_ANALYSIS_PROFILEINFO_H
 
 #include "llvm/BasicBlock.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Compiler.h"
 #include <cassert>
 #include <string>
 #include <map>
@@ -31,6 +29,7 @@
 namespace llvm {
   class Function;
   class Pass;
+  class raw_ostream;
 
   /// ProfileInfo Class - This class holds and maintains profiling
   /// information for some unit of code.
@@ -106,16 +105,7 @@
   /// it available to the optimizers.
   Pass *createProfileLoaderPass(const std::string &Filename);
 
-  static raw_ostream& operator<<(raw_ostream &O,
-                                 ProfileInfo::Edge E) ATTRIBUTE_USED;
-  static raw_ostream& operator<<(raw_ostream &O,
-                                 ProfileInfo::Edge E) {
-    O<<"(";
-    O<<(E.first?E.first->getNameStr():"0");
-    O<<",";
-    O<<(E.second?E.second->getNameStr():"0");
-    return O<<")";
-  }
+  raw_ostream& operator<<(raw_ostream &O, ProfileInfo::Edge E);
 
 } // End llvm namespace
 

Modified: llvm/trunk/lib/Analysis/ProfileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ProfileInfo.cpp?rev=80103&r1=80102&r2=80103&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/ProfileInfo.cpp (original)
+++ llvm/trunk/lib/Analysis/ProfileInfo.cpp Wed Aug 26 10:56:38 2009
@@ -17,6 +17,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/raw_ostream.h"
 #include <set>
 using namespace llvm;
 
@@ -81,6 +82,13 @@
   return Count;
 }
 
+raw_ostream& llvm::operator<<(raw_ostream &O, ProfileInfo::Edge E) {
+  O << "(";
+  O << (E.first ? E.first->getNameStr() : "0");
+  O << ",";
+  O << (E.second ? E.second->getNameStr() : "0");
+  return O << ")";
+}
 
 //===----------------------------------------------------------------------===//
 //  NoProfile ProfileInfo implementation