From 10073a9080498f8ce8ad87b425d8bbb5b6536b67 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 25 Jul 2002 06:17:51 +0000 Subject: [PATCH] *** empty log message *** llvm-svn: 3075 --- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp | 2 +- llvm/lib/CodeGen/InstrSched/SchedGraph.cpp | 4 ++-- llvm/lib/CodeGen/InstrSched/SchedGraph.h | 4 ++-- llvm/lib/CodeGen/MachineFunction.cpp | 4 ++-- llvm/lib/CodeGen/MachineInstr.cpp | 10 +++++----- llvm/lib/Support/CommandLine.cpp | 4 ++-- llvm/lib/Support/PluginLoader.cpp | 3 ++- llvm/lib/Target/TargetData.cpp | 10 +++++----- llvm/lib/Transforms/IPO/MutateStructTypes.cpp | 2 +- llvm/lib/Transforms/IPO/OldPoolAllocate.cpp | 1 + llvm/lib/Transforms/Scalar/Reassociate.cpp | 2 +- llvm/lib/Transforms/TransformInternals.cpp | 4 ++-- llvm/support/lib/Support/CommandLine.cpp | 4 ++-- llvm/support/lib/Support/PluginLoader.cpp | 3 ++- 14 files changed, 30 insertions(+), 27 deletions(-) diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp index 2271c780a3cd..19c6922d342e 100644 --- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp +++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp @@ -79,7 +79,7 @@ private: //---------------------------------------------------------------------- template -class ScheduleIterator: public std::forward_iterator<_NodeType, ptrdiff_t> { +class ScheduleIterator : public forward_iterator<_NodeType, ptrdiff_t> { private: unsigned cycleNum; unsigned slotNum; diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp index 8a9c8e573b3b..781604eaae7c 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -132,7 +132,7 @@ SchedGraphEdge::~SchedGraphEdge() { } -void SchedGraphEdge::dump(int indent=0) const { +void SchedGraphEdge::dump(int indent) const { cerr << std::string(indent*2, ' ') << *this; } @@ -171,7 +171,7 @@ SchedGraphNode::~SchedGraphNode() deleter); } -void SchedGraphNode::dump(int indent=0) const { +void SchedGraphNode::dump(int indent) const { cerr << std::string(indent*2, ' ') << *this; } diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.h b/llvm/lib/CodeGen/InstrSched/SchedGraph.h index 7db22d67346d..0d59734e2da6 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedGraph.h +++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.h @@ -377,7 +377,7 @@ private: // for . // template -class SGPredIterator: public std::bidirectional_iterator<_NodeType, ptrdiff_t> { +class SGPredIterator: public bidirectional_iterator<_NodeType, ptrdiff_t> { protected: _EdgeIter oi; public: @@ -406,7 +406,7 @@ public: }; template -class SGSuccIterator: public std::bidirectional_iterator<_NodeType, ptrdiff_t> { +class SGSuccIterator : public bidirectional_iterator<_NodeType, ptrdiff_t> { protected: _EdgeIter oi; public: diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp index ce39b45f12c6..f32f647e112e 100644 --- a/llvm/lib/CodeGen/MachineFunction.cpp +++ b/llvm/lib/CodeGen/MachineFunction.cpp @@ -139,7 +139,7 @@ int MachineCodeForMethod::computeOffsetforLocalVar(const TargetMachine& target, const Value* val, unsigned int& getPaddedSize, - unsigned int sizeToUse = 0) + unsigned int sizeToUse) { bool growUp; int firstOffset =target.getFrameInfo().getFirstAutomaticVarOffset(*this, @@ -174,7 +174,7 @@ MachineCodeForMethod::computeOffsetforLocalVar(const TargetMachine& target, int MachineCodeForMethod::allocateLocalVar(const TargetMachine& target, const Value* val, - unsigned int sizeToUse = 0) + unsigned int sizeToUse) { assert(! automaticVarsAreaFrozen && "Size of auto vars area has been used to compute an offset so " diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index 4fc373065881..124c28a2d975 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -44,8 +44,8 @@ void MachineInstr::SetMachineOperandVal(unsigned int i, MachineOperand::MachineOperandType opType, Value* _val, - bool isdef=false, - bool isDefAndUse=false) + bool isdef, + bool isDefAndUse) { assert(i < operands.size()); operands[i].Initialize(opType, _val); @@ -69,9 +69,9 @@ MachineInstr::SetMachineOperandConst(unsigned int i, void MachineInstr::SetMachineOperandReg(unsigned int i, int regNum, - bool isdef=false, - bool isDefAndUse=false, - bool isCCReg=false) + bool isdef, + bool isDefAndUse, + bool isCCReg) { assert(i < operands.size()); operands[i].InitializeReg(regNum, isCCReg); diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp index 433cefda7bf7..e125ebeb8220 100644 --- a/llvm/lib/Support/CommandLine.cpp +++ b/llvm/lib/Support/CommandLine.cpp @@ -138,7 +138,7 @@ static bool EatsUnboundedNumberOfValues(const Option *O) { } void cl::ParseCommandLineOptions(int &argc, char **argv, - const char *Overview = 0) { + const char *Overview) { assert((!getOpts().empty() || !getPositionalOpts().empty()) && "No options specified, or ParseCommandLineOptions called more" " than once!"); @@ -396,7 +396,7 @@ void cl::ParseCommandLineOptions(int &argc, char **argv, // Option Base class implementation // -bool Option::error(string Message, const char *ArgName = 0) { +bool Option::error(string Message, const char *ArgName) { if (ArgName == 0) ArgName = ArgStr; if (ArgName[0] == 0) cerr << HelpStr; // Be nice for positional arguments diff --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp index c2e4e89813a8..dce923af7f67 100644 --- a/llvm/lib/Support/PluginLoader.cpp +++ b/llvm/lib/Support/PluginLoader.cpp @@ -13,6 +13,7 @@ #include "Support/CommandLine.h" #include #include +#include namespace { struct PluginLoader { @@ -25,6 +26,6 @@ namespace { } // This causes operator= above to be invoked for every -load option. -static cl::opt > +static cl::opt > LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"), cl::desc("Load the specified plugin")); diff --git a/llvm/lib/Target/TargetData.cpp b/llvm/lib/Target/TargetData.cpp index e306d4e250fb..8712fc9f5987 100644 --- a/llvm/lib/Target/TargetData.cpp +++ b/llvm/lib/Target/TargetData.cpp @@ -74,11 +74,11 @@ Annotation *TargetData::TypeAnFactory(AnnotationID AID, const Annotable *T, //===----------------------------------------------------------------------===// TargetData::TargetData(const std::string &TargetName, - unsigned char IntRegSize = 8, unsigned char PtrSize = 8, - unsigned char PtrAl = 8, unsigned char DoubleAl = 8, - unsigned char FloatAl = 4, unsigned char LongAl = 8, - unsigned char IntAl = 4, unsigned char ShortAl = 2, - unsigned char ByteAl = 1) + unsigned char IntRegSize, unsigned char PtrSize, + unsigned char PtrAl, unsigned char DoubleAl, + unsigned char FloatAl, unsigned char LongAl, + unsigned char IntAl, unsigned char ShortAl, + unsigned char ByteAl) : AID(AnnotationManager::getID("TargetData::" + TargetName)) { AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this); diff --git a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp index 4058a3d03aa6..174f7a102b1c 100644 --- a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp +++ b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp @@ -108,7 +108,7 @@ const Type *MutateStructTypes::ConvertType(const Type *Ty) { // void MutateStructTypes::AdjustIndices(const CompositeType *OldTy, vector &Idx, - unsigned i = 0) { + unsigned i) { assert(i < Idx.size() && "i out of range!"); const CompositeType *NewCT = cast(ConvertType(OldTy)); if (NewCT == OldTy) return; // No adjustment unless type changes diff --git a/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp b/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp index e74c8b22c15a..c22d53ef9176 100644 --- a/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp +++ b/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp @@ -1759,5 +1759,6 @@ bool PoolAllocate::run(Module &M) { // Pass *createPoolAllocatePass() { assert(0 && "Pool allocator disabled!"); + return 0; //return new PoolAllocate(); } diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp index 05758039d944..a6ad88a9ea65 100644 --- a/llvm/lib/Transforms/Scalar/Reassociate.cpp +++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp @@ -33,7 +33,7 @@ static Statistic<> NumSwapped("reassociate\t- Number of insts with operands swap namespace { class Reassociate : public FunctionPass { - map RankMap; + std::map RankMap; public: bool runOnFunction(Function &F); diff --git a/llvm/lib/Transforms/TransformInternals.cpp b/llvm/lib/Transforms/TransformInternals.cpp index 05bc69438b6d..f8476231cf9b 100644 --- a/llvm/lib/Transforms/TransformInternals.cpp +++ b/llvm/lib/Transforms/TransformInternals.cpp @@ -52,7 +52,7 @@ static const Type *getStructOffsetStep(const StructType *STy, unsigned &Offset, // const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, std::vector &Indices, - bool StopEarly = true) { + bool StopEarly) { if (Offset == 0 && StopEarly && !Indices.empty()) return Ty; // Return the leaf type @@ -87,7 +87,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, // const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, std::vector &Indices, - BasicBlock::iterator *BI = 0) { + BasicBlock::iterator *BI) { const CompositeType *CompTy = dyn_cast(Ty); if (CompTy == 0) return 0; diff --git a/llvm/support/lib/Support/CommandLine.cpp b/llvm/support/lib/Support/CommandLine.cpp index 433cefda7bf7..e125ebeb8220 100644 --- a/llvm/support/lib/Support/CommandLine.cpp +++ b/llvm/support/lib/Support/CommandLine.cpp @@ -138,7 +138,7 @@ static bool EatsUnboundedNumberOfValues(const Option *O) { } void cl::ParseCommandLineOptions(int &argc, char **argv, - const char *Overview = 0) { + const char *Overview) { assert((!getOpts().empty() || !getPositionalOpts().empty()) && "No options specified, or ParseCommandLineOptions called more" " than once!"); @@ -396,7 +396,7 @@ void cl::ParseCommandLineOptions(int &argc, char **argv, // Option Base class implementation // -bool Option::error(string Message, const char *ArgName = 0) { +bool Option::error(string Message, const char *ArgName) { if (ArgName == 0) ArgName = ArgStr; if (ArgName[0] == 0) cerr << HelpStr; // Be nice for positional arguments diff --git a/llvm/support/lib/Support/PluginLoader.cpp b/llvm/support/lib/Support/PluginLoader.cpp index c2e4e89813a8..dce923af7f67 100644 --- a/llvm/support/lib/Support/PluginLoader.cpp +++ b/llvm/support/lib/Support/PluginLoader.cpp @@ -13,6 +13,7 @@ #include "Support/CommandLine.h" #include #include +#include namespace { struct PluginLoader { @@ -25,6 +26,6 @@ namespace { } // This causes operator= above to be invoked for every -load option. -static cl::opt > +static cl::opt > LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"), cl::desc("Load the specified plugin"));