MC: Tweak variable assignment diagnostics, and make reassignment of non-absolute

variables and symbols invalid.

llvm-svn: 84232
This commit is contained in:
Daniel Dunbar 2009-10-16 01:57:39 +00:00
parent 35a99d95b3
commit 5f339244fb
3 changed files with 36 additions and 7 deletions

View File

@ -125,6 +125,7 @@ void MCAsmStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
OS << '\n';
// FIXME: Lift context changes into super class.
// FIXME: Set associated section.
Symbol->setValue(Value);
}

View File

@ -0,0 +1,17 @@
// RUN: not llvm-mc %s 2> %t
// RUN: FileCheck --input-file %t %s
.data
// CHECK: invalid assignment to 't0_v0'
t0_v0 = t0_v0 + 1
t1_v1 = 1
t1_v1 = 2
t2_s0:
// CHECK: redefinition of 't2_s0'
t2_s0 = 2
t3_s0 = t2_s0 + 1
// CHECK: invalid reassignment of non-absolute variable 't3_s0'
t3_s0 = 1

View File

@ -741,14 +741,25 @@ bool AsmParser::ParseAssignment(const StringRef &Name) {
// Eat the end of statement marker.
Lexer.Lex();
// Validate that the LHS is allowed to be a variable (either it has not been
// used as a symbol, or it is an absolute symbol).
MCSymbol *Sym = getContext().LookupSymbol(Name);
if (Sym) {
// Diagnose assignment to a label.
//
// FIXME: Diagnostics. Note the location of the definition as a label.
// FIXME: Handle '.'.
// FIXME: Diagnose assignment to protected identifier (e.g., register name).
MCSymbol *Sym = CreateSymbol(Name);
if (!Sym->isUndefined() && !Sym->isAbsolute())
return Error(EqualLoc, "symbol has already been defined");
return Error(EqualLoc, "redefinition of '" + Name + "'");
else if (!Sym->isVariable())
return Error(EqualLoc, "invalid assignment to '" + Name + "'");
else if (!isa<MCConstantExpr>(Sym->getValue()))
return Error(EqualLoc, "invalid reassignment of non-absolute variable '" +
Name + "'");
} else
Sym = CreateSymbol(Name);
// FIXME: Handle '.'.
// Do the assignment.
Out.EmitAssignment(Sym, Value);