X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FAnalysis%2FTrace.cpp;h=5a1acc00fb94ad59e23adc427711fc30b8cc8e26;hp=9fc7b8a2c6aeec8e5f9153601706d4bc63391284;hb=67bd697ef77533a1af0621293eebb3cd51addf65;hpb=954da37bb492b519f5c31dc360f2a142567e08b4

diff --git a/lib/Analysis/Trace.cpp b/lib/Analysis/Trace.cpp
index 9fc7b8a2c6a..5a1acc00fb9 100644
--- a/lib/Analysis/Trace.cpp
+++ b/lib/Analysis/Trace.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -16,37 +16,37 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/Trace.h"
-#include "llvm/Function.h"
-#include "llvm/Assembly/Writer.h"
-#include <iostream>
-
+#include "llvm/IR/Function.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
 Function *Trace::getFunction() const {
   return getEntryBasicBlock()->getParent();
 }
 
-
 Module *Trace::getModule() const {
   return getFunction()->getParent();
 }
 
 /// print - Write trace to output stream.
 ///
-void Trace::print (std::ostream &O) const {
-  Function *F = getFunction ();
-  O << "; Trace from function " << F->getName () << ", blocks:\n";
-  for (const_iterator i = begin (), e = end (); i != e; ++i) {
+void Trace::print(raw_ostream &O) const {
+  Function *F = getFunction();
+  O << "; Trace from function " << F->getName() << ", blocks:\n";
+  for (const_iterator i = begin(), e = end(); i != e; ++i) {
     O << "; ";
-    WriteAsOperand (O, *i, true, true, getModule ());
+    (*i)->printAsOperand(O, true, getModule());
     O << "\n";
   }
   O << "; Trace parent function: \n" << *F;
 }
 
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 /// dump - Debugger convenience method; writes trace to standard error
 /// output stream.
 ///
-void Trace::dump () const {
-  print (std::cerr);
+void Trace::dump() const {
+  print(dbgs());
 }
+#endif