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 | 91dad87ddc1e69ac5fa8953a583de4185e1dd0d7 (patch) | |
| tree | 6a12e29325bb30cd38d867586b684ab1e4f7bc19 | |
| parent | f5db1fbf7ac5b2a90807ef2f1be5fae3cecba5dd (diff) | |
| download | external_llvm-91dad87ddc1e69ac5fa8953a583de4185e1dd0d7.zip external_llvm-91dad87ddc1e69ac5fa8953a583de4185e1dd0d7.tar.gz external_llvm-91dad87ddc1e69ac5fa8953a583de4185e1dd0d7.tar.bz2 | |
Fix PR3372
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63501 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 5 | ||||
| -rw-r--r-- | test/Assembler/2009-02-01-UnnamedForwardRef.ll | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 401dc39..943f1d0 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/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/test/Assembler/2009-02-01-UnnamedForwardRef.ll b/test/Assembler/2009-02-01-UnnamedForwardRef.ll new file mode 100644 index 0000000..9c6e20d --- /dev/null +++ b/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 + |