6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-10 04:33:40 +00:00
Code Issues Projects Releases Wiki Activity

MC: Reject attempts to define a variable symbol.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103111 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-05-05 19:01:00 +00:00
parent 8d627d3153
commit c304718fd8
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/MC/MCAsmStreamer.cpp
View File

@ -218,6 +218,7 @@ void MCAsmStreamer::SwitchSection(const MCSection *Section) {
void MCAsmStreamer::EmitLabel(MCSymbol *Symbol) { void MCAsmStreamer::EmitLabel(MCSymbol *Symbol) {
assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
assert(!Symbol->isVariable() && "Cannot emit a variable symbol!");
assert(CurSection && "Cannot emit before setting section!"); assert(CurSection && "Cannot emit before setting section!");
OS << *Symbol << ":"; OS << *Symbol << ":";
@ -234,10 +235,6 @@ void MCAsmStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {
} }
void MCAsmStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) { void MCAsmStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
// Only absolute symbols can be redefined.
assert((Symbol->isUndefined() || Symbol->isAbsolute()) &&
"Cannot define a symbol twice!");
OS << *Symbol << " = " << *Value; OS << *Symbol << " = " << *Value;
EmitEOL(); EmitEOL();

6
lib/MC/MCMachOStreamer.cpp
View File

@ -162,6 +162,8 @@ void MCMachOStreamer::SwitchSection(const MCSection *Section) {
void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) { void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
assert(!Symbol->isVariable() && "Cannot emit a variable symbol!");
assert(CurSection && "Cannot emit before setting section!");
// FIXME: This is wasteful, we don't necessarily need to create a data // FIXME: This is wasteful, we don't necessarily need to create a data
// fragment. Instead, we should mark the symbol as pointing into the data // fragment. Instead, we should mark the symbol as pointing into the data
@ -190,10 +192,6 @@ void MCMachOStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {
} }
void MCMachOStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) { void MCMachOStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
// Only absolute symbols can be redefined.
assert((Symbol->isUndefined() || Symbol->isAbsolute()) &&
"Cannot define a symbol twice!");
// FIXME: Lift context changes into super class. // FIXME: Lift context changes into super class.
// FIXME: Set associated section. // FIXME: Set associated section.
Symbol->setVariableValue(AddValueSymbols(Value)); Symbol->setVariableValue(AddValueSymbols(Value));

2
lib/MC/MCParser/AsmParser.cpp
View File

@ -457,7 +457,7 @@ bool AsmParser::ParseStatement() {
// FIXME: This doesn't diagnose assignment to a symbol which has been // FIXME: This doesn't diagnose assignment to a symbol which has been
// implicitly marked as external. // implicitly marked as external.
MCSymbol *Sym = CreateSymbol(IDVal); MCSymbol *Sym = CreateSymbol(IDVal);
if (!Sym->isUndefined()) if (!Sym->isUndefined() || Sym->isVariable())
return Error(IDLoc, "invalid symbol redefinition"); return Error(IDLoc, "invalid symbol redefinition");
// Emit the label. // Emit the label.