Fix usage of out-of-scope variable.

Change TagsNamesMap to be static.

Author: sivan-shani

llvm/include/llvm/Support/AArch64AttributeParser.h

@@ -15,7 +15,7 @@
 namespace llvm {
 
 class AArch64AttributeParser : public ELFExtendedAttrParser {
-  static std::vector<SubsectionAndTagToTagName> returnTagsNamesMap();
+  static std::vector<SubsectionAndTagToTagName> &returnTagsNamesMap();
 
 public:
   AArch64AttributeParser(ScopedPrinter *Sw)

llvm/include/llvm/Support/ELFAttrParserExtended.h

@@ -42,10 +42,12 @@ class ELFExtendedAttrParser : public ELFAttributeParser {
   std::optional<StringRef> getAttributeString(StringRef BuildAttrSubsectionName,
                                               unsigned Tag) const override;
 
-  ELFExtendedAttrParser(ScopedPrinter *Sw,
-                        std::vector<SubsectionAndTagToTagName> TagsNamesMap)
+  ELFExtendedAttrParser(
+      ScopedPrinter *Sw,
+      const std::vector<SubsectionAndTagToTagName> TagsNamesMap)
       : Sw(Sw), TagsNamesMap(TagsNamesMap) {}
-  ELFExtendedAttrParser(std::vector<SubsectionAndTagToTagName> TagsNamesMap)
+  ELFExtendedAttrParser(
+      const std::vector<SubsectionAndTagToTagName> TagsNamesMap)
       : Sw(nullptr), TagsNamesMap(TagsNamesMap) {}
 };
 } // namespace llvm

llvm/lib/Support/AArch64AttributeParser.cpp

@@ -9,11 +9,13 @@
 
 #include "llvm/Support/AArch64AttributeParser.h"
 
-std::vector<llvm::SubsectionAndTagToTagName>
+std::vector<llvm::SubsectionAndTagToTagName> &
 llvm::AArch64AttributeParser::returnTagsNamesMap() {
-  return {{"aeabi_pauthabi", 1, "Tag_PAuth_Platform"},
-          {"aeabi_pauthabi", 2, "Tag_PAuth_Schema"},
-          {"aeabi_feature_and_bits", 0, "Tag_Feature_BTI"},
-          {"aeabi_feature_and_bits", 1, "Tag_Feature_PAC"},
-          {"aeabi_feature_and_bits", 2, "Tag_Feature_GCS"}};
+  static std::vector<SubsectionAndTagToTagName> TagsNamesMap = {
+      {"aeabi_pauthabi", 1, "Tag_PAuth_Platform"},
+      {"aeabi_pauthabi", 2, "Tag_PAuth_Schema"},
+      {"aeabi_feature_and_bits", 0, "Tag_Feature_BTI"},
+      {"aeabi_feature_and_bits", 1, "Tag_Feature_PAC"},
+      {"aeabi_feature_and_bits", 2, "Tag_Feature_GCS"}};
+  return TagsNamesMap;
 }

llvm/lib/Support/ELFAttrParserExtended.cpp

@@ -136,19 +136,17 @@ Error ELFExtendedAttrParser::parse(ArrayRef<uint8_t> Section,
       uint64_t Tag = De.getULEB128(Cursor);
 
       StringRef TagName = getTagName(VendorName, Tag);
-      if ("" == TagName)
-        TagName = StringRef(utostr(Tag));
 
       uint64_t ValueInt = 0;
       std::string ValueStr = "";
       if (Type) { // type==1 --> ntbs
         ValueStr = De.getCStrRef(Cursor);
         if (Sw)
-          Sw->printString(TagName, ValueStr);
+          Sw->printString("" != TagName ? TagName : utostr(Tag), ValueStr);
       } else { // type==0 --> uleb128
-        uint64_t ValueInt = De.getULEB128(Cursor);
+        ValueInt = De.getULEB128(Cursor);
         if (Sw)
-          Sw->printNumber(TagName, ValueInt);
+          Sw->printNumber("" != TagName ? TagName : utostr(Tag), ValueInt);
       }
 
       // populate data structure