Changes in directory llvm/lib/Transforms/IPO:
GlobalOpt.cpp updated: 1.77 -> 1.78
Internalize.cpp updated: 1.38 -> 1.39
---
Log message:
Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.
---
Diffs of the changes: (+19 -20)
GlobalOpt.cpp | 36 ++++++++++++++++++------------------
Internalize.cpp | 3 +--
2 files changed, 19 insertions(+), 20 deletions(-)
Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.77
llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.78
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.77 Wed Dec 6 11:46:32 2006
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp Wed Dec 6 19:30:31 2006
@@ -494,17 +494,17 @@
// Will trap.
} else if (StoreInst *SI = dyn_cast<StoreInst>(*UI)) {
if (SI->getOperand(0) == V) {
- //llvm_cerr << "NONTRAPPING USE: " << **UI;
+ //cerr << "NONTRAPPING USE: " << **UI;
return false; // Storing the value.
}
} else if (CallInst *CI = dyn_cast<CallInst>(*UI)) {
if (CI->getOperand(0) != V) {
- //llvm_cerr << "NONTRAPPING USE: " << **UI;
+ //cerr << "NONTRAPPING USE: " << **UI;
return false; // Not calling the ptr
}
} else if (InvokeInst *II = dyn_cast<InvokeInst>(*UI)) {
if (II->getOperand(0) != V) {
- //llvm_cerr << "NONTRAPPING USE: " << **UI;
+ //cerr << "NONTRAPPING USE: " << **UI;
return false; // Not calling the ptr
}
} else if (CastInst *CI = dyn_cast<CastInst>(*UI)) {
@@ -515,7 +515,7 @@
isa<ConstantPointerNull>(UI->getOperand(1))) {
// Ignore setcc X, null
} else {
- //llvm_cerr << "NONTRAPPING USE: " << **UI;
+ //cerr << "NONTRAPPING USE: " << **UI;
return false;
}
return true;
@@ -533,7 +533,7 @@
// Ignore stores to the global.
} else {
// We don't know or understand this user, bail out.
- //llvm_cerr << "UNKNOWN USER OF GLOBAL!: " << **UI;
+ //cerr << "UNKNOWN USER OF GLOBAL!: " << **UI;
return false;
}
@@ -1206,25 +1206,25 @@
if (!AnalyzeGlobal(GV, GS, PHIUsers)) {
#if 0
- llvm_cerr << "Global: " << *GV;
- llvm_cerr << " isLoaded = " << GS.isLoaded << "\n";
- llvm_cerr << " StoredType = ";
+ cerr << "Global: " << *GV;
+ cerr << " isLoaded = " << GS.isLoaded << "\n";
+ cerr << " StoredType = ";
switch (GS.StoredType) {
- case GlobalStatus::NotStored: llvm_cerr << "NEVER STORED\n"; break;
- case GlobalStatus::isInitializerStored: llvm_cerr << "INIT STORED\n";
break;
- case GlobalStatus::isStoredOnce: llvm_cerr << "STORED ONCE\n"; break;
- case GlobalStatus::isStored: llvm_cerr << "stored\n"; break;
+ case GlobalStatus::NotStored: cerr << "NEVER STORED\n"; break;
+ case GlobalStatus::isInitializerStored: cerr << "INIT STORED\n"; break;
+ case GlobalStatus::isStoredOnce: cerr << "STORED ONCE\n"; break;
+ case GlobalStatus::isStored: cerr << "stored\n"; break;
}
if (GS.StoredType == GlobalStatus::isStoredOnce && GS.StoredOnceValue)
- llvm_cerr << " StoredOnceValue = " << *GS.StoredOnceValue << "\n";
+ cerr << " StoredOnceValue = " << *GS.StoredOnceValue << "\n";
if (GS.AccessingFunction && !GS.HasMultipleAccessingFunctions)
- llvm_cerr << " AccessingFunction = " << GS.AccessingFunction->getName()
+ cerr << " AccessingFunction = " << GS.AccessingFunction->getName()
<< "\n";
- llvm_cerr << " HasMultipleAccessingFunctions = "
+ cerr << " HasMultipleAccessingFunctions = "
<< GS.HasMultipleAccessingFunctions << "\n";
- llvm_cerr << " HasNonInstructionUser = " <<
GS.HasNonInstructionUser<<"\n";
- llvm_cerr << " isNotSuitableForSRA = " << GS.isNotSuitableForSRA << "\n";
- llvm_cerr << "\n";
+ cerr << " HasNonInstructionUser = " << GS.HasNonInstructionUser<<"\n";
+ cerr << " isNotSuitableForSRA = " << GS.isNotSuitableForSRA << "\n";
+ cerr << "\n";
#endif
// If this is a first class global and has only one accessing function
Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.38
llvm/lib/Transforms/IPO/Internalize.cpp:1.39
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.38 Wed Dec 6 11:46:32 2006
+++ llvm/lib/Transforms/IPO/Internalize.cpp Wed Dec 6 19:30:31 2006
@@ -74,8 +74,7 @@
// Load the APIFile...
std::ifstream In(Filename);
if (!In.good()) {
- llvm_cerr << "WARNING: Internalize couldn't load file '" << Filename
- << "'!\n";
+ cerr << "WARNING: Internalize couldn't load file '" << Filename << "'!\n";
return; // Do not internalize anything...
}
while (In) {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
