<div dir="ltr">Doh, sorry I forgot to pick up Polly here. =/ Thanks for cleaning it up. Hopefully not *too* much refactoring left.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jan 9, 2014 at 5:42 AM, Tobias Grosser <span dir="ltr"><<a href="mailto:tobias@grosser.es" target="_blank">tobias@grosser.es</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: grosser<br>
Date: Thu Jan 9 04:42:15 2014<br>
New Revision: 198859<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=198859&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=198859&view=rev</a><br>
Log:<br>
Remove IR/Writer.h<br>
<br>
This should fix the buildbots.<br>
<br>
Modified:<br>
polly/trunk/lib/Analysis/MayAliasSet.cpp<br>
polly/trunk/lib/Analysis/ScopDetection.cpp<br>
polly/trunk/lib/Analysis/ScopInfo.cpp<br>
polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
polly/trunk/lib/CodeGen/Cloog.cpp<br>
polly/trunk/lib/Exchange/JSONExporter.cpp<br>
polly/trunk/lib/IndependentBlocks.cpp<br>
<br>
Modified: polly/trunk/lib/Analysis/MayAliasSet.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/MayAliasSet.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/MayAliasSet.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/MayAliasSet.cpp (original)<br>
+++ polly/trunk/lib/Analysis/MayAliasSet.cpp Thu Jan 9 04:42:15 2014<br>
@@ -17,7 +17,6 @@<br>
#include "llvm/Analysis/AliasSetTracker.h"<br>
#include "llvm/Analysis/RegionInfo.h"<br>
#include "llvm/Analysis/RegionIterator.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/IR/LLVMContext.h"<br>
#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
@@ -29,7 +28,7 @@ void MayAliasSet::print(raw_ostream &OS)<br>
OS << "Must alias {";<br>
<br>
for (const_iterator I = mustalias_begin(), E = mustalias_end(); I != E; ++I) {<br>
- WriteAsOperand(OS, *I, false);<br>
+ (*I)->printAsOperand(OS, false);<br>
OS << ", ";<br>
}<br>
<br>
<br>
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)<br>
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Thu Jan 9 04:42:15 2014<br>
@@ -56,7 +56,6 @@<br>
#include "llvm/Analysis/RegionIterator.h"<br>
#include "llvm/Analysis/ScalarEvolution.h"<br>
#include "llvm/Analysis/ScalarEvolutionExpressions.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/DebugInfo.h"<br>
#include "llvm/IR/LLVMContext.h"<br>
#include "llvm/IR/DiagnosticInfo.h"<br>
<br>
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)<br>
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Thu Jan 9 04:42:15 2014<br>
@@ -30,7 +30,6 @@<br>
#include "llvm/Analysis/LoopInfo.h"<br>
#include "llvm/Analysis/RegionIterator.h"<br>
#include "llvm/Analysis/ScalarEvolutionExpressions.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/Support/CommandLine.h"<br>
<br>
#define DEBUG_TYPE "polly-scops"<br>
@@ -287,7 +286,7 @@ static void makeIslCompatible(std::strin<br>
<br>
void MemoryAccess::setBaseName() {<br>
raw_string_ostream OS(BaseName);<br>
- WriteAsOperand(OS, getBaseAddr(), false);<br>
+ getBaseAddr()->printAsOperand(OS, false);<br>
BaseName = OS.str();<br>
<br>
makeIslCompatible(BaseName);<br>
@@ -656,7 +655,7 @@ ScopStmt::ScopStmt(Scop &parent, TempSco<br>
}<br>
<br>
raw_string_ostream OS(BaseName);<br>
- WriteAsOperand(OS, &bb, false);<br>
+ bb.printAsOperand(OS, false);<br>
BaseName = OS.str();<br>
<br>
makeIslCompatible(BaseName);<br>
@@ -875,11 +874,11 @@ std::string Scop::getNameStr() const {<br>
raw_string_ostream ExitStr(ExitName);<br>
raw_string_ostream EntryStr(EntryName);<br>
<br>
- WriteAsOperand(EntryStr, R.getEntry(), false);<br>
+ R.getEntry()->printAsOperand(EntryStr, false);<br>
EntryStr.str();<br>
<br>
if (R.getExit()) {<br>
- WriteAsOperand(ExitStr, R.getExit(), false);<br>
+ R.getExit()->printAsOperand(ExitStr, false);<br>
ExitStr.str();<br>
} else<br>
ExitName = "FunctionExit";<br>
<br>
Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)<br>
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Thu Jan 9 04:42:15 2014<br>
@@ -25,7 +25,6 @@<br>
#include "llvm/Analysis/RegionIterator.h"<br>
#include "llvm/Analysis/ScalarEvolution.h"<br>
#include "llvm/Analysis/ScalarEvolutionExpressions.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/IR/DataLayout.h"<br>
<br>
#define DEBUG_TYPE "polly-analyze-ir"<br>
<br>
Modified: polly/trunk/lib/CodeGen/Cloog.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Cloog.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Cloog.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/CodeGen/Cloog.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/Cloog.cpp Thu Jan 9 04:42:15 2014<br>
@@ -28,7 +28,6 @@<br>
#include "polly/ScopInfo.h"<br>
<br>
#define DEBUG_TYPE "polly-cloog"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/IR/Module.h"<br>
#include "llvm/Support/Debug.h"<br>
<br>
@@ -258,11 +257,11 @@ std::string CloogExporter::getFileName(R<br>
raw_string_ostream ExitStr(ExitName);<br>
raw_string_ostream EntryStr(EntryName);<br>
<br>
- WriteAsOperand(EntryStr, R->getEntry(), false);<br>
+ R->getEntry()->printAsOperand(EntryStr, false);<br>
EntryStr.str();<br>
<br>
if (R->getExit()) {<br>
- WriteAsOperand(ExitStr, R->getExit(), false);<br>
+ R->getExit()->printAsOperand(ExitStr, false);<br>
ExitStr.str();<br>
} else<br>
ExitName = "FunctionExit";<br>
<br>
Modified: polly/trunk/lib/Exchange/JSONExporter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/JSONExporter.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/JSONExporter.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Exchange/JSONExporter.cpp (original)<br>
+++ polly/trunk/lib/Exchange/JSONExporter.cpp Thu Jan 9 04:42:15 2014<br>
@@ -18,7 +18,6 @@<br>
#include "polly/ScopPass.h"<br>
#include "llvm/ADT/OwningPtr.h"<br>
#include "llvm/ADT/Statistic.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/Support/MemoryBuffer.h"<br>
#include "llvm/Support/ToolOutputFile.h"<br>
#include "llvm/Support/system_error.h"<br>
<br>
Modified: polly/trunk/lib/IndependentBlocks.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=198859&r1=198858&r2=198859&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=198859&r1=198858&r2=198859&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/IndependentBlocks.cpp (original)<br>
+++ polly/trunk/lib/IndependentBlocks.cpp Thu Jan 9 04:42:15 2014<br>
@@ -20,7 +20,6 @@<br>
#include "llvm/Analysis/LoopInfo.h"<br>
#include "llvm/Analysis/RegionInfo.h"<br>
#include "llvm/Analysis/ValueTracking.h"<br>
-#include "llvm/IR/Writer.h"<br>
#include "llvm/Transforms/Utils/Local.h"<br>
#include "llvm/Support/CommandLine.h"<br>
#define DEBUG_TYPE "polly-independent"<br>
@@ -481,13 +480,13 @@ bool IndependentBlocks::isIndependentBlo<br>
OI != OE; ++OI) {<br>
if (isEscapeOperand(*OI, BB, R)) {<br>
DEBUG(dbgs() << "Instruction in function '";<br>
- WriteAsOperand(dbgs(), BB->getParent(), false);<br>
+ BB->getParent()->printAsOperand(dbgs(), false);<br>
dbgs() << "' not independent:\n");<br>
DEBUG(dbgs() << "Uses invalid operator\n");<br>
DEBUG(Inst->print(dbgs()));<br>
DEBUG(dbgs() << "\n");<br>
DEBUG(dbgs() << "Invalid operator is: ";<br>
- WriteAsOperand(dbgs(), *OI, false); dbgs() << "\n");<br>
+ (*OI)->printAsOperand(dbgs(), false); dbgs() << "\n");<br>
return false;<br>
}<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>