diff options
| author | Jim Grosbach <grosbach@apple.com> | 2012-03-20 21:33:21 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2012-03-20 21:33:21 +0000 |
| commit | 48c9533181ec7ef24e49a4f5bca9151dc6886bad (patch) | |
| tree | 7e8ccd80330d37eecac5967c986746c9563e13c2 | |
| parent | 93a1a0dbda3e5e449a6b498f753130d0c240cacd (diff) | |
| download | llvm-48c9533181ec7ef24e49a4f5bca9151dc6886bad.tar.gz llvm-48c9533181ec7ef24e49a4f5bca9151dc6886bad.tar.bz2 llvm-48c9533181ec7ef24e49a4f5bca9151dc6886bad.tar.xz | |
Assembler should accept redefinitions of unused variable symbols.
rdar://11027851
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153137 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 2 | ||||
| -rw-r--r-- | lib/MC/MCSymbol.cpp | 2 | ||||
| -rw-r--r-- | test/MC/AsmParser/variables-invalid.s | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 41ad1642d2..ab5ddaf4ac 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -1629,6 +1629,8 @@ bool AsmParser::ParseAssignment(StringRef Name, bool allow_redef) { return Error(EqualLoc, "Recursive use of '" + Name + "'"); else if (Sym->isUndefined() && !Sym->isUsed() && !Sym->isVariable()) ; // Allow redefinitions of undefined symbols only used in directives. + else if (Sym->isVariable() && !Sym->isUsed() && allow_redef) + ; // Allow redefinitions of variables that haven't yet been used. else if (!Sym->isUndefined() && (!Sym->isVariable() || !allow_redef)) return Error(EqualLoc, "redefinition of '" + Name + "'"); else if (!Sym->isVariable()) diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp index 87b58d7a53..e013e77f58 100644 --- a/lib/MC/MCSymbol.cpp +++ b/lib/MC/MCSymbol.cpp @@ -54,8 +54,6 @@ const MCSymbol &MCSymbol::AliasedSymbol() const { void MCSymbol::setVariableValue(const MCExpr *Value) { assert(!IsUsed && "Cannot set a variable that has already been used."); assert(Value && "Invalid variable value!"); - assert((isUndefined() || (isAbsolute() && isa<MCConstantExpr>(Value))) && - "Invalid redefinition!"); this->Value = Value; // Variables should always be marked as in the same "section" as the value. diff --git a/test/MC/AsmParser/variables-invalid.s b/test/MC/AsmParser/variables-invalid.s index 21758d20c8..c466d422b9 100644 --- a/test/MC/AsmParser/variables-invalid.s +++ b/test/MC/AsmParser/variables-invalid.s @@ -13,6 +13,7 @@ t2_s0: t2_s0 = 2 t3_s0 = t2_s0 + 1 + .long t3_s0 // CHECK: invalid reassignment of non-absolute variable 't3_s0' t3_s0 = 1 |