X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FCBackend%2FWriter.cpp;h=a4b7d8f4dba7346ad09b843ac74cfa57aa3d6f27;hb=d5d89967206e1153d24abdb7b22002f7533f55c7;hp=7e1c84f7d1fad8d33d79d89cd189f4ea229e3811;hpb=aeb2a1d70807aa626f335fb23d47bc604ffeaa15;p=oota-llvm.git diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp index 7e1c84f7d1f..a4b7d8f4dba 100644 --- a/lib/Target/CBackend/Writer.cpp +++ b/lib/Target/CBackend/Writer.cpp @@ -201,17 +201,16 @@ std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty, const FunctionType *MTy = cast(Ty); std::stringstream FunctionInnards; FunctionInnards << " (" << NameSoFar << ") ("; - for (FunctionType::ParamTypes::const_iterator - I = MTy->getParamTypes().begin(), - E = MTy->getParamTypes().end(); I != E; ++I) { - if (I != MTy->getParamTypes().begin()) + for (FunctionType::param_iterator I = MTy->param_begin(), + E = MTy->param_end(); I != E; ++I) { + if (I != MTy->param_begin()) FunctionInnards << ", "; printType(FunctionInnards, *I, ""); } if (MTy->isVarArg()) { - if (!MTy->getParamTypes().empty()) + if (MTy->getNumParams()) FunctionInnards << ", ..."; - } else if (MTy->getParamTypes().empty()) { + } else if (!MTy->getNumParams()) { FunctionInnards << "void"; } FunctionInnards << ")"; @@ -948,10 +947,9 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { } } else { // Loop over the arguments, printing them... - for (FunctionType::ParamTypes::const_iterator I = - FT->getParamTypes().begin(), - E = FT->getParamTypes().end(); I != E; ++I) { - if (I != FT->getParamTypes().begin()) FunctionInnards << ", "; + for (FunctionType::param_iterator I = FT->param_begin(), + E = FT->param_end(); I != E; ++I) { + if (I != FT->param_begin()) FunctionInnards << ", "; printType(FunctionInnards, *I); } } @@ -959,10 +957,10 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { // Finish printing arguments... if this is a vararg function, print the ..., // unless there are no known types, in which case, we just emit (). // - if (FT->isVarArg() && !FT->getParamTypes().empty()) { - if (FT->getParamTypes().size()) FunctionInnards << ", "; + if (FT->isVarArg() && FT->getNumParams()) { + if (FT->getNumParams()) FunctionInnards << ", "; FunctionInnards << "..."; // Output varargs portion of signature! - } else if (!FT->isVarArg() && FT->getParamTypes().empty()) { + } else if (!FT->isVarArg() && FT->getNumParams() == 0) { FunctionInnards << "void"; // ret() -> ret(void) in C. } FunctionInnards << ")";