Remove hasLDAttributes() and hasERAttributes()

Just inline and simplify the expressions.

Author: redstar

llvm/include/llvm/MC/MCSymbolGOFF.h

@@ -38,9 +38,6 @@ class MCSymbolGOFF : public MCSymbol {
   MCSymbolGOFF(const MCSymbolTableEntry *Name, bool IsTemporary)
       : MCSymbol(Name, IsTemporary) {}
 
-  bool hasLDAttributes() const;
-  bool hasERAttributes() const;
-
   void setADA(MCSectionGOFF *AssociatedDataArea) {
     ADA = AssociatedDataArea;
     AssociatedDataArea->RequiresNonZeroLength = true;

llvm/lib/MC/GOFFObjectWriter.cpp

@@ -372,10 +372,12 @@ void GOFFWriter::defineSymbols() {
     if (Sym.isTemporary())
       continue;
     auto &Symbol = static_cast<const MCSymbolGOFF &>(Sym);
-    if (Symbol.hasLDAttributes()) {
+    bool IsDefined = Symbol.isDefined();
+    if (IsDefined &&
+         static_cast<MCSectionGOFF &>(Symbol.getSection()).isED()) {
       Symbol.setIndex(++Ordinal);
       defineLabel(Symbol);
-    } else if (Symbol.hasERAttributes()) {
+    } else if (!IsDefined) {
       Symbol.setIndex(++Ordinal);
       defineExtern(Symbol);
     }

llvm/lib/MC/MCSymbolGOFF.cpp

@@ -12,15 +12,6 @@
 
 using namespace llvm;
 
-bool MCSymbolGOFF::hasLDAttributes() const {
-  return !isTemporary() && isDefined() &&
-         static_cast<MCSectionGOFF &>(getSection()).isED();
-}
-
-bool MCSymbolGOFF::hasERAttributes() const {
-  return !isTemporary() && !isDefined() && isExternal();
-}
-
 bool MCSymbolGOFF::setSymbolAttribute(MCSymbolAttr Attribute) {
   switch (Attribute) {
   case MCSA_Invalid:

llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp

@@ -226,9 +226,9 @@ static void emitXATTR(raw_ostream &OS, StringRef Name,
 }
 
 static bool sameNameAsCSECT(MCSymbolGOFF *Sym) {
-  if (Sym->hasLDAttributes() && Sym->isInSection()) {
+  if (!Sym->isTemporary() && Sym->isDefined() && Sym->isInSection()) {
     MCSectionGOFF &ED = static_cast<MCSectionGOFF &>(Sym->getSection());
-    return Sym->getName() == ED.getParent()->getName();
+    return ED.isED() && Sym->getName() == ED.getParent()->getName();
   }
   return false;
 }
@@ -241,7 +241,8 @@ void SystemZHLASMAsmStreamer::emitLabel(MCSymbol *Symbol, SMLoc Loc) {
   // Emit ENTRY statement only if not implied by CSECT.
   bool EmitEntry = !sameNameAsCSECT(Sym);
 
-  if (!Sym->isTemporary() && Sym->hasLDAttributes()) {
+  if (!Sym->isTemporary() && Sym->isDefined() &&
+      static_cast<MCSectionGOFF &>(Sym->getSection()).isED()) {
     if (EmitEntry) {
       OS << " ENTRY " << Sym->getName();
       EmitEOL();
@@ -358,14 +359,14 @@ void SystemZHLASMAsmStreamer::finishImpl() {
     if (Symbol.isTemporary())
       continue;
     if (Symbol.isRegistered()) {
+      if (Symbol.isDefined())
+        continue;
       auto &Sym = static_cast<MCSymbolGOFF &>(const_cast<MCSymbol &>(Symbol));
-      if (Sym.hasERAttributes()) {
-        OS << " " << (Sym.isWeak() ? "WXTRN" : "EXTRN") << " " << Sym.getName();
-        EmitEOL();
-        emitXATTR(OS, Sym.getName(), Sym.getLinkage(), Sym.getCodeData(),
-                  Sym.getBindingScope());
-        EmitEOL();
-      }
+      OS << " " << (Sym.isWeak() ? "WXTRN" : "EXTRN") << " " << Sym.getName();
+      EmitEOL();
+      emitXATTR(OS, Sym.getName(), Sym.getLinkage(), Sym.getCodeData(),
+                Sym.getBindingScope());
+      EmitEOL();
     }
   }