This is an archive of the discontinued LLVM Phabricator instance.

Differential D26728

[AsmParser] Diagnose empty symbol for .set directive
ClosedPublic

Authored by weimingz on Nov 15 2016, 6:21 PM.

Details

Reviewers
rengolin
eli.friedman
Commits
rGcf26d563901a: [AsmParser] Diagnose empty symbol for .set directive
rL288390: [AsmParser] Diagnose empty symbol for .set directive
Summary

Diagnose empty symbol to avoid hitting assertion in MCContext::getOrCreateSymbol

Diff Detail

Repository
rL LLVM

Event Timeline

weimingz updated this revision to Diff 78121.Nov 15 2016, 6:21 PM
weimingz retitled this revision from to [AsmParser] Reject empty symbol for .set directive.
weimingz updated this object.
weimingz set the repository for this revision to rL LLVM.
weimingz added a subscriber: llvm-commits.
weimingz added a reviewer: rengolin.Nov 28 2016, 11:15 AM
weimingz retitled this revision from [AsmParser] Reject empty symbol for .set directive to [AsmParser] Diagnose empty symbol for .set directive.Nov 28 2016, 11:18 AM
weimingz updated this object.
weimingz added a reviewer: eli.friedman.Nov 30 2016, 4:58 PM
rengolin accepted this revision.Dec 1 2016, 4:02 AM
rengolin edited edge metadata.
This revision is now accepted and ready to land.Dec 1 2016, 4:02 AM
Closed by commit rL288390: [AsmParser] Diagnose empty symbol for .set directive (authored by weimingz). · Explain WhyDec 1 2016, 10:10 AM
This revision was automatically updated to reflect the committed changes.
thegameg mentioned this in D52645: [AsmParser] Return an error in the case of empty symbol ref in an expression.Sep 28 2018, 4:13 AM

Revision Contents

PathSize
lib/
MC/
MCParser/
3 lines
test/
MC/
AsmParser/
3 lines

Diff 78121

lib/MC/MCParser/AsmParser.cpp

Show First 20 Lines • Show All 967 Lines • ▼ Show 20 Lines if (!MAI.useParensForSymbolVariant()) {
return true; return true;
Split = std::make_pair(Identifier, VName); Split = std::make_pair(Identifier, VName);
} }
EndLoc = SMLoc::getFromPointer(Identifier.end()); EndLoc = SMLoc::getFromPointer(Identifier.end());
// This is a symbol reference. // This is a symbol reference.
StringRef SymbolName = Identifier; StringRef SymbolName = Identifier;
if (SymbolName.empty())
return true;
MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
// Lookup the symbol variant if used. // Lookup the symbol variant if used.
if (Split.second.size()) { if (Split.second.size()) {
Variant = MCSymbolRefExpr::getVariantKindForName(Split.second); Variant = MCSymbolRefExpr::getVariantKindForName(Split.second);
if (Variant != MCSymbolRefExpr::VK_Invalid) { if (Variant != MCSymbolRefExpr::VK_Invalid) {
SymbolName = Split.first; SymbolName = Split.first;
} else if (MAI.doesAllowAtInName() && !MAI.useParensForSymbolVariant()) { } else if (MAI.doesAllowAtInName() && !MAI.useParensForSymbolVariant()) {
▲ Show 20 Lines • Show All 4,536 Lines • Show Last 20 Lines

test/MC/AsmParser/equ.s

// RUN: not llvm-mc -n -triple i386-unknown-unknown %s 2> %t // RUN: not llvm-mc -n -triple i386-unknown-unknown %s 2> %t
// RUN: FileCheck < %t %s // RUN: FileCheck < %t %s
.equ a, 0 .equ a, 0
.set a, 1 .set a, 1
.equ a, 2 .equ a, 2
.equiv a, 3 .equiv a, 3
.set b, ""
// CHECK: error: redefinition of 'a' // CHECK: error: redefinition of 'a'
// CHECK: error: missing expression in '.set' directive