diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-02-02 07:24:28 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-02-02 07:24:28 +0000 |
| commit | 1f386b8ec8de5d24f2eaaa676db0737fe298bccf (patch) | |
| tree | 6160a18e13e21d309f7591f4372915a355e43f7e | |
| parent | 1aafe4ceceeeb8ff57fc43f40f93ab3591a98e70 (diff) | |
| download | bcm5719-llvm-1f386b8ec8de5d24f2eaaa676db0737fe298bccf.tar.gz bcm5719-llvm-1f386b8ec8de5d24f2eaaa676db0737fe298bccf.zip | |
Fix PR3372
llvm-svn: 63501
| -rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/Assembler/2009-02-01-UnnamedForwardRef.ll | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index 401dc39ca53..943f1d00256 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -471,8 +471,9 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc, GlobalVariable *GV = 0; // See if the global was forward referenced, if so, use the global. - if (!Name.empty() && (GV = M->getGlobalVariable(Name, true))) { - if (!ForwardRefVals.erase(Name)) + if (!Name.empty()) { + if ((GV = M->getGlobalVariable(Name, true)) && + !ForwardRefVals.erase(Name)) return Error(NameLoc, "redefinition of global '@" + Name + "'"); } else { std::map<unsigned, std::pair<GlobalValue*, LocTy> >::iterator diff --git a/llvm/test/Assembler/2009-02-01-UnnamedForwardRef.ll b/llvm/test/Assembler/2009-02-01-UnnamedForwardRef.ll new file mode 100644 index 00000000000..9c6e20d7335 --- /dev/null +++ b/llvm/test/Assembler/2009-02-01-UnnamedForwardRef.ll @@ -0,0 +1,6 @@ +; RUN: llvm-as < %s | llvm-dis +; PR3372 + +@X = global i32* @0 +global i32 4 + |
