7 files changed, 9 insertions, 16 deletions
diff --git a/polly/lib/Analysis/MayAliasSet.cpp b/polly/lib/Analysis/MayAliasSet.cpp
index c39873ea141..e7205ee7741 100644
--- a/polly/lib/Analysis/MayAliasSet.cpp
+++ b/polly/lib/Analysis/MayAliasSet.cpp
@@ -17,7 +17,6 @@
 #include "llvm/Analysis/AliasSetTracker.h"
 #include "llvm/Analysis/RegionInfo.h"
 #include "llvm/Analysis/RegionIterator.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
@@ -29,7 +28,7 @@ void MayAliasSet::print(raw_ostream &OS) const {
   OS << "Must alias {";
 
   for (const_iterator I = mustalias_begin(), E = mustalias_end(); I != E; ++I) {
-    WriteAsOperand(OS, *I, false);
+    (*I)->printAsOperand(OS, false);
     OS << ", ";
   }
 
diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp
index ddc6699b814..50b7f1b5948 100644
--- a/polly/lib/Analysis/ScopDetection.cpp
+++ b/polly/lib/Analysis/ScopDetection.cpp
@@ -56,7 +56,6 @@
 #include "llvm/Analysis/RegionIterator.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/DebugInfo.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/DiagnosticInfo.h"
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index df9f7b02c92..1b6ddeceac7 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -30,7 +30,6 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/RegionIterator.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/Support/CommandLine.h"
 
 #define DEBUG_TYPE "polly-scops"
@@ -287,7 +286,7 @@ static void makeIslCompatible(std::string &str) {
 
 void MemoryAccess::setBaseName() {
   raw_string_ostream OS(BaseName);
-  WriteAsOperand(OS, getBaseAddr(), false);
+  getBaseAddr()->printAsOperand(OS, false);
   BaseName = OS.str();
 
   makeIslCompatible(BaseName);
@@ -656,7 +655,7 @@ ScopStmt::ScopStmt(Scop &parent, TempScop &tempScop, const Region &CurRegion,
   }
 
   raw_string_ostream OS(BaseName);
-  WriteAsOperand(OS, &bb, false);
+  bb.printAsOperand(OS, false);
   BaseName = OS.str();
 
   makeIslCompatible(BaseName);
@@ -875,11 +874,11 @@ std::string Scop::getNameStr() const {
   raw_string_ostream ExitStr(ExitName);
   raw_string_ostream EntryStr(EntryName);
 
-  WriteAsOperand(EntryStr, R.getEntry(), false);
+  R.getEntry()->printAsOperand(EntryStr, false);
   EntryStr.str();
 
   if (R.getExit()) {
-    WriteAsOperand(ExitStr, R.getExit(), false);
+    R.getExit()->printAsOperand(ExitStr, false);
     ExitStr.str();
   } else
     ExitName = "FunctionExit";
diff --git a/polly/lib/Analysis/TempScopInfo.cpp b/polly/lib/Analysis/TempScopInfo.cpp
index a12be08c3df..c8a8490e9fb 100644
--- a/polly/lib/Analysis/TempScopInfo.cpp
+++ b/polly/lib/Analysis/TempScopInfo.cpp
@@ -25,7 +25,6 @@
 #include "llvm/Analysis/RegionIterator.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/IR/DataLayout.h"
 
 #define DEBUG_TYPE "polly-analyze-ir"
diff --git a/polly/lib/CodeGen/Cloog.cpp b/polly/lib/CodeGen/Cloog.cpp
index 607dcbefe49..ebf82b614e6 100644
--- a/polly/lib/CodeGen/Cloog.cpp
+++ b/polly/lib/CodeGen/Cloog.cpp
@@ -28,7 +28,6 @@
 #include "polly/ScopInfo.h"
 
 #define DEBUG_TYPE "polly-cloog"
-#include "llvm/IR/Writer.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Debug.h"
 
@@ -258,11 +257,11 @@ std::string CloogExporter::getFileName(Region *R) const {
   raw_string_ostream ExitStr(ExitName);
   raw_string_ostream EntryStr(EntryName);
 
-  WriteAsOperand(EntryStr, R->getEntry(), false);
+  R->getEntry()->printAsOperand(EntryStr, false);
   EntryStr.str();
 
   if (R->getExit()) {
-    WriteAsOperand(ExitStr, R->getExit(), false);
+    R->getExit()->printAsOperand(ExitStr, false);
     ExitStr.str();
   } else
     ExitName = "FunctionExit";
diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index 3d9d15263bd..92c69d208fe 100644
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -18,7 +18,6 @@
 #include "polly/ScopPass.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/Statistic.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/ToolOutputFile.h"
 #include "llvm/Support/system_error.h"
diff --git a/polly/lib/IndependentBlocks.cpp b/polly/lib/IndependentBlocks.cpp
index fde88f3d479..e7c520027ea 100644
--- a/polly/lib/IndependentBlocks.cpp
+++ b/polly/lib/IndependentBlocks.cpp
@@ -20,7 +20,6 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/RegionInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
-#include "llvm/IR/Writer.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Support/CommandLine.h"
 #define DEBUG_TYPE "polly-independent"
@@ -481,13 +480,13 @@ bool IndependentBlocks::isIndependentBlock(const Region *R,
          OI != OE; ++OI) {
       if (isEscapeOperand(*OI, BB, R)) {
         DEBUG(dbgs() << "Instruction in function '";
-              WriteAsOperand(dbgs(), BB->getParent(), false);
+              BB->getParent()->printAsOperand(dbgs(), false);
               dbgs() << "' not independent:\n");
         DEBUG(dbgs() << "Uses invalid operator\n");
         DEBUG(Inst->print(dbgs()));
         DEBUG(dbgs() << "\n");
         DEBUG(dbgs() << "Invalid operator is: ";
-              WriteAsOperand(dbgs(), *OI, false); dbgs() << "\n");
+              (*OI)->printAsOperand(dbgs(), false); dbgs() << "\n");
         return false;
       }
     }