diff options
| -rw-r--r-- | include/llvm/Analysis/InstForest.h | 8 | ||||
| -rw-r--r-- | include/llvm/Assembly/CachedWriter.h | 4 | ||||
| -rw-r--r-- | include/llvm/Assembly/Writer.h | 10 |
3 files changed, 9 insertions, 13 deletions
diff --git a/include/llvm/Analysis/InstForest.h b/include/llvm/Analysis/InstForest.h index aacbb13fb7..79b7bca8ef 100644 --- a/include/llvm/Analysis/InstForest.h +++ b/include/llvm/Analysis/InstForest.h @@ -1,4 +1,4 @@ -//===- llvm/Analysis/InstForest.h - Partition Method into forest -*- C++ -*--=// +//===- llvm/Analysis/InstForest.h - Partition Func into forest ---*- C++ -*--=// // // This interface is used to partition a method into a forest of instruction // trees, where the following invariants hold: @@ -163,8 +163,8 @@ class InstForest : public std::vector<InstTreeNode<Payload> *> { public: // ctor - Create an instruction forest for the specified method... - InstForest(Method *M) { - for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) { + InstForest(Function *F) { + for (Function::iterator MI = F->begin(), ME = F->end(); MI != ME; ++MI) { BasicBlock *BB = *MI; for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { Instruction *Inst = *I; @@ -240,7 +240,7 @@ InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V, if (!isa<Instruction>(V)) { assert((isa<Constant>(V) || isa<BasicBlock>(V) || - isa<MethodArgument>(V) || isa<GlobalValue>(V)) && + isa<FunctionArgument>(V) || isa<GlobalValue>(V)) && "Unrecognized value type for InstForest Partition!"); if (isa<Constant>(V)) getTreeData().first.second = ConstNode; diff --git a/include/llvm/Assembly/CachedWriter.h b/include/llvm/Assembly/CachedWriter.h index cccf0377a4..20b4c05ffb 100644 --- a/include/llvm/Assembly/CachedWriter.h +++ b/include/llvm/Assembly/CachedWriter.h @@ -43,10 +43,10 @@ public: inline CachedWriter &operator<<(const GlobalVariable *X) { return *this << (const Value*)X; } - inline CachedWriter &operator<<(const Method *X) { + inline CachedWriter &operator<<(const Function *X) { return *this << (const Value*)X; } - inline CachedWriter &operator<<(const MethodArgument *X) { + inline CachedWriter &operator<<(const FunctionArgument *X) { return *this << (const Value*)X; } inline CachedWriter &operator<<(const BasicBlock *X) { diff --git a/include/llvm/Assembly/Writer.h b/include/llvm/Assembly/Writer.h index 5d5a746274..a148c0b48a 100644 --- a/include/llvm/Assembly/Writer.h +++ b/include/llvm/Assembly/Writer.h @@ -19,11 +19,6 @@ #include <iostream> #include "llvm/Type.h" -class Module; -class GlobalVariable; -class Function; -class BasicBlock; -class Instruction; class SlotCalculator; // The only interface defined by this file... convert the internal @@ -100,10 +95,11 @@ inline std::ostream &operator<<(std::ostream &o, const Value *I) { switch (I->getValueType()) { case Value::TypeVal: return o << cast<const Type>(I); case Value::ConstantVal: WriteToAssembly(cast<Constant>(I) , o); break; - case Value::MethodArgumentVal: return o << I->getType() << " "<< I->getName(); + case Value::FunctionArgumentVal: + return o << I->getType() << " " << I->getName(); case Value::InstructionVal:WriteToAssembly(cast<Instruction>(I) , o); break; case Value::BasicBlockVal: WriteToAssembly(cast<BasicBlock>(I) , o); break; - case Value::MethodVal: WriteToAssembly(cast<Function>(I) , o); break; + case Value::FunctionVal: WriteToAssembly(cast<Function>(I) , o); break; case Value::GlobalVariableVal: WriteToAssembly(cast<GlobalVariable>(I), o); break; case Value::ModuleVal: WriteToAssembly(cast<Module>(I) , o); break; |