Skip to content

Commit 3ae07d1

Browse files
sivan-shanisivan-shani
committed
[AArch64][Build Attributes] Remove unused 'Override' parameter
Since the function accepts assembly that adds a different value for an existing tag, the 'Override' parameter is no longer needed.
1 parent 9c3f0f7 commit 3ae07d1

File tree

5 files changed

+21
-29
lines changed

5 files changed

+21
-29
lines changed

‎llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,10 @@ void AArch64AsmPrinter::emitAttributes(unsigned Flags,
482482
AArch64BuildAttrs::SubsectionType::ULEB128);
483483
TS->emitAttribute(
484484
AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI),
485-
AArch64BuildAttrs::TAG_PAUTH_PLATFORM, PAuthABIPlatform, "", false);
485+
AArch64BuildAttrs::TAG_PAUTH_PLATFORM, PAuthABIPlatform, "");
486486
TS->emitAttribute(
487487
AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI),
488-
AArch64BuildAttrs::TAG_PAUTH_SCHEMA, PAuthABIVersion, "", false);
488+
AArch64BuildAttrs::TAG_PAUTH_SCHEMA, PAuthABIVersion, "");
489489
}
490490

491491
unsigned BTIValue = (Flags & AArch64BuildAttrs::Feature_BTI_Flag) ? 1 : 0;
@@ -499,13 +499,13 @@ void AArch64AsmPrinter::emitAttributes(unsigned Flags,
499499
AArch64BuildAttrs::SubsectionType::ULEB128);
500500
TS->emitAttribute(AArch64BuildAttrs::getVendorName(
501501
AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
502-
AArch64BuildAttrs::TAG_FEATURE_BTI, BTIValue, "", false);
502+
AArch64BuildAttrs::TAG_FEATURE_BTI, BTIValue, "");
503503
TS->emitAttribute(AArch64BuildAttrs::getVendorName(
504504
AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
505-
AArch64BuildAttrs::TAG_FEATURE_PAC, PACValue, "", false);
505+
AArch64BuildAttrs::TAG_FEATURE_PAC, PACValue, "");
506506
TS->emitAttribute(AArch64BuildAttrs::getVendorName(
507507
AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
508-
AArch64BuildAttrs::TAG_FEATURE_GCS, GCSValue, "", false);
508+
AArch64BuildAttrs::TAG_FEATURE_GCS, GCSValue, "");
509509
}
510510
}
511511

‎llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8088,12 +8088,11 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
80888088
}
80898089

80908090
if (unsigned(-1) != ValueInt) {
8091-
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, ValueInt, "",
8092-
false);
8091+
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, ValueInt, "");
80938092
}
80948093
if ("" != ValueStr) {
80958094
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, unsigned(-1),
8096-
ValueStr, false);
8095+
ValueStr);
80978096
}
80988097
return false;
80998098
}

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
151151
}
152152

153153
void emitAttribute(StringRef VendorName, unsigned Tag, unsigned Value,
154-
std::string String, bool Override) override {
154+
std::string String) override {
155155

156156
// AArch64 build attributes for assembly attribute form:
157157
// .aeabi_attribute tag, value
@@ -169,13 +169,12 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
169169
case AArch64BuildAttrs::VENDOR_UNKNOWN:
170170
if (unsigned(-1) != Value) {
171171
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
172-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
173-
Override);
172+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
174173
}
175174
if ("" != String) {
176175
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << String;
177176
AArch64TargetStreamer::emitAttribute(VendorName, Tag, unsigned(-1),
178-
String, Override);
177+
String);
179178
}
180179
break;
181180
// Note: AEABI_FEATURE_AND_BITS takes only unsigned values
@@ -185,16 +184,14 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
185184
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
186185
// Keep the data structure consistent with the case of ELF emission
187186
// (important for llvm-mc asm parsing)
188-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
189-
Override);
187+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
190188
break;
191189
case AArch64BuildAttrs::TAG_FEATURE_BTI:
192190
case AArch64BuildAttrs::TAG_FEATURE_GCS:
193191
case AArch64BuildAttrs::TAG_FEATURE_PAC:
194192
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t// "
195193
<< AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag);
196-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
197-
Override);
194+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
198195
break;
199196
}
200197
break;
@@ -205,15 +202,13 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
205202
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
206203
// Keep the data structure consistent with the case of ELF emission
207204
// (important for llvm-mc asm parsing)
208-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
209-
Override);
205+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
210206
break;
211207
case AArch64BuildAttrs::TAG_PAUTH_PLATFORM:
212208
case AArch64BuildAttrs::TAG_PAUTH_SCHEMA:
213209
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t// "
214210
<< AArch64BuildAttrs::getPauthABITagsStr(Tag);
215-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
216-
Override);
211+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
217212
break;
218213
}
219214
break;
@@ -426,13 +421,12 @@ void AArch64TargetELFStreamer::emitAtributesSubsection(
426421
}
427422

428423
void AArch64TargetELFStreamer::emitAttribute(StringRef VendorName, unsigned Tag,
429-
unsigned Value, std::string String,
430-
bool Override) {
424+
unsigned Value,
425+
std::string String) {
431426
if (unsigned(-1) != Value)
432-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "", Override);
427+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "");
433428
if ("" != String)
434-
AArch64TargetStreamer::emitAttribute(VendorName, Tag, unsigned(-1), String,
435-
Override);
429+
AArch64TargetStreamer::emitAttribute(VendorName, Tag, unsigned(-1), String);
436430
}
437431

438432
void AArch64TargetELFStreamer::emitInst(uint32_t Inst) {

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ AArch64TargetStreamer::getAtributesSubsectionByName(StringRef Name) {
194194
}
195195

196196
void AArch64TargetStreamer::emitAttribute(StringRef VendorName, unsigned Tag,
197-
unsigned Value, std::string String,
198-
bool Override) {
197+
unsigned Value, std::string String) {
199198

200199
if (unsigned(-1) == Value && "" == String) {
201200
assert(0 && "Arguments error");

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class AArch64TargetStreamer : public MCTargetStreamer {
100100
AArch64BuildAttrs::SubsectionOptional IsOptional,
101101
AArch64BuildAttrs::SubsectionType ParameterType);
102102
virtual void emitAttribute(StringRef VendorName, unsigned Tag, unsigned Value,
103-
std::string String, bool Override);
103+
std::string String);
104104
void activateAtributesSubsection(StringRef VendorName);
105105
std::unique_ptr<MCELFStreamer::AttributeSubSection>
106106
getActiveAtributesSubsection();
@@ -127,7 +127,7 @@ class AArch64TargetELFStreamer : public AArch64TargetStreamer {
127127
StringRef VendorName, AArch64BuildAttrs::SubsectionOptional IsOptional,
128128
AArch64BuildAttrs::SubsectionType ParameterType) override;
129129
void emitAttribute(StringRef VendorName, unsigned Tag, unsigned Value,
130-
std::string String, bool Override = false) override;
130+
std::string String) override;
131131
void emitInst(uint32_t Inst) override;
132132
void emitDirectiveVariantPCS(MCSymbol *Symbol) override;
133133
void finish() override;

0 commit comments

Comments
 (0)