diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 16 | ||||
| -rw-r--r-- | lib/VMCore/AsmWriter.cpp | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index cddb343a56..abddc59bde 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2094,11 +2094,21 @@ bool LLParser::ParseFunctionHeader(Function *&Fn, bool isDefine) { isa<OpaqueType>(RetType)) return Error(RetTypeLoc, "invalid function return type"); - if (Lex.getKind() != lltok::GlobalVar) + LocTy NameLoc = Lex.getLoc(); + + std::string FunctionName; + if (Lex.getKind() == lltok::GlobalVar) { + FunctionName = Lex.getStrVal(); + } else if (Lex.getKind() == lltok::GlobalID) { // @42 is ok. + unsigned NameID = Lex.getUIntVal(); + + if (NameID != NumberedVals.size()) + return TokError("function expected to be numbered '%" + + utostr(NumberedVals.size()) + "'"); + } else { return TokError("expected function name"); + } - LocTy NameLoc = Lex.getLoc(); - std::string FunctionName = Lex.getStrVal(); Lex.Lex(); if (Lex.getKind() != lltok::lparen) diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 6718da4ca0..68cf438e29 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -1240,10 +1240,7 @@ void AssemblyWriter::printAlias(const GlobalAlias *GA) { printType(F->getFunctionType()); Out << "* "; - if (F->hasName()) - PrintLLVMName(Out, F); - else - Out << "@\"\""; + WriteAsOperandInternal(Out, F, TypeNames, &Machine); } else if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(Aliasee)) { printType(GA->getType()); Out << " "; @@ -1310,10 +1307,7 @@ void AssemblyWriter::printFunction(const Function *F) { Out << Attribute::getAsString(Attrs.getRetAttributes()) << ' '; printType(F->getReturnType()); Out << ' '; - if (F->hasName()) - PrintLLVMName(Out, F); - else - Out << "@\"\""; + WriteAsOperandInternal(Out, F, TypeNames, &Machine); Out << '('; Machine.incorporateFunction(F); |