diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-17 20:45:56 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-17 20:45:56 +0000 |
| commit | 5a44950aae2d6a27df8498bd69050a2c397d4f68 (patch) | |
| tree | 5d93823936f9e496eca05d083b6cb27944f0edcb /llvm | |
| parent | aad5fa85d06989ee3270e2012245f481b5de19e3 (diff) | |
| download | bcm5719-llvm-5a44950aae2d6a27df8498bd69050a2c397d4f68.tar.gz bcm5719-llvm-5a44950aae2d6a27df8498bd69050a2c397d4f68.zip | |
reject forward references to functions whose type don't match
up with the definition (and fix a broken testcase). PR6491.
llvm-svn: 101670
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Bitcode/memcpy.ll | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index fe8e9c7f07d..aa887d21777 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -2787,6 +2787,10 @@ bool LLParser::ParseFunctionHeader(Function *&Fn, bool isDefine) { ForwardRefVals.find(FunctionName); if (FRVI != ForwardRefVals.end()) { Fn = M->getFunction(FunctionName); + if (Fn->getType() != PFT) + return Error(FRVI->second.second, "invalid forward reference to " + "function '" + FunctionName + "' with wrong type!"); + ForwardRefVals.erase(FRVI); } else if ((Fn = M->getFunction(FunctionName))) { // If this function already exists in the symbol table, then it is diff --git a/llvm/test/Bitcode/memcpy.ll b/llvm/test/Bitcode/memcpy.ll index b6573b5f621..299eb1ed41e 100644 --- a/llvm/test/Bitcode/memcpy.ll +++ b/llvm/test/Bitcode/memcpy.ll @@ -20,4 +20,4 @@ declare void @llvm.memset.i32(i8*, i8, i32, i32) declare void @llvm.memmove.i32(i8*, i8*, i32, i32) -declare void @llvm.memmove.i64(i8*, i8*, i32, i32) +declare void @llvm.memmove.i64(i8*, i8*, i64, i32) |
