2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Bytecode/Writer/ConstantWriter.cpp b/lib/Bytecode/Writer/ConstantWriter.cpp
index 73130f3ee8..296e326445 100644
--- a/lib/Bytecode/Writer/ConstantWriter.cpp
+++ b/lib/Bytecode/Writer/ConstantWriter.cpp
@@ -24,8 +24,8 @@ void BytecodeWriter::outputType(const Type *T) {
     return;     // We might do this if we alias a prim type: %x = type int
   
   switch (T->getPrimitiveID()) {   // Handle derived types now.
-  case Type::MethodTyID: {
-    const MethodType *MT = cast<const MethodType>(T);
+  case Type::FunctionTyID: {
+    const FunctionType *MT = cast<const FunctionType>(T);
     int Slot = Table.getValSlot(MT->getReturnType());
     assert(Slot != -1 && "Type used but not available!!");
     output_vbr((unsigned)Slot, Out);
@@ -34,7 +34,7 @@ void BytecodeWriter::outputType(const Type *T) {
     output_vbr(MT->getParamTypes().size()+MT->isVarArg(), Out);
 
     // Output all of the arguments...
-    MethodType::ParamTypes::const_iterator I = MT->getParamTypes().begin();
+    FunctionType::ParamTypes::const_iterator I = MT->getParamTypes().begin();
     for (; I != MT->getParamTypes().end(); ++I) {
       Slot = Table.getValSlot(*I);
       assert(Slot != -1 && "Type used but not available!!");
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index a83bd1642c..af53ee5c0e 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -150,7 +150,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
 }
 
 void BytecodeWriter::processMethod(const Function *M) {
-  BytecodeBlock FunctionBlock(BytecodeFormat::Method, Out);
+  BytecodeBlock FunctionBlock(BytecodeFormat::Function, Out);
   output_vbr((unsigned)M->hasInternalLinkage(), Out);
   // Only output the constant pool and other goodies if needed...
   if (!M->isExternal()) {