[clang][extract-api] Add support for true anonymous enums

[dang]

Summary

Anonymous enums without a typedef should have a "(anonymous)" identifier.

[zixuw]

clang/test/ExtractAPI/enum.c

684

nit: normalize

693

So the Name of the record is literally (anonymous)? I think this might create problems (well I guess we always had this problem) that multiple anonymous records of the same kind getting the same Name, and RecordMap is indexed with it...
We should switch the key of RecordMaps to USR instead probably.

720

nit: normalize

[dang]

Address code review feedback:

• Normalize test file URIs
• Key RecordMaps by USR instead of by Name

[dang]

clang/test/ExtractAPI/enum.c

693

Agreed, added this to this patch.

[zixuw]

clang/test/ExtractAPI/enum.c

693

Nice! Thanks Daniel!
Could you please also update the test case to see if it now handles two anonymous records correctly?

[dang]

Add a second anonymous enum to the test case to make sure that distinct symbols
are generated for both of them.

[zixuw]

LGTM

clang/lib/ExtractAPI/ExtractAPIConsumer.cpp

bool VisitEnumDecl(const EnumDecl *Decl) {
     // Skip forward declaration.
     if (!Decl->isThisDeclarationADefinition())
       return true;
 
     if (!LCF.isLocationInKnownFile(Decl->getLocation()))
       return true;
 
     // Collect symbol information.
-    StringRef Name = Decl->getName();
+    std::string NameString = Decl->getQualifiedNameAsString();
+    StringRef Name(NameString);
     if (Name.empty())
       Name = getTypedefName(Decl);
+
     StringRef USR = API.recordUSR(Decl);
     PresumedLoc Loc =
         Context.getSourceManager().getPresumedLoc(Decl->getLocation());
     AvailabilityInfo Availability = getAvailability(Decl);
     DocComment Comment;
     if (auto *RawComment = Context.getRawCommentForDeclNoCache(Decl))
       Comment = RawComment->getFormattedLines(Context.getSourceManager(),
                                               Context.getDiagnostics());
 
     // Build declaration fragments and sub-heading for the enum.
     DeclarationFragments Declaration =
         DeclarationFragmentsBuilder::getFragmentsForEnum(Decl);
     DeclarationFragments SubHeading =
         DeclarationFragmentsBuilder::getSubHeading(Decl);
 
-    EnumRecord *EnumRecord = API.addEnum(Name, USR, Loc, Availability, Comment,
-                                         Declaration, SubHeading);
+    EnumRecord *EnumRecord =
+        API.addEnum(API.copyString(Name), USR, Loc, Availability, Comment,
 
     // Now collect information about the enumerators in this enum.
     recordEnumConstants(EnumRecord, Decl->enumerators());
 
     return true;
   }
 
   bool VisitRecordDecl(const RecordDecl *Decl) {

clang/test/ExtractAPI/enum.c

 
 enum Direction : unsigned char {
   North = 0,
   East,
   South,
   West
 };
 
+enum {
+  Constant = 1
+};
+
 //--- reference.output.json.in
 {
   "metadata": {
     "formatVersion": {
       "major": 0,
       "minor": 5,
       "patch": 3
     },
"relationships": [
       "kind": "memberOf",
       "source": "c:@E@Direction@South",
       "target": "c:@E@Direction"
     },
     {
       "kind": "memberOf",
       "source": "c:@E@Direction@West",
       "target": "c:@E@Direction"
+    },
+    {
+      "kind": "memberOf",
+      "source": "c:@Ea@Constant@Constant",
+      "target": "c:@Ea@Constant"
     }
   ],
   "symbols": [
     {
       "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
"symbols": [
           }
         ],
         "title": "West"
       },
       "pathComponents": [
         "Direction",
         "West"
       ]
+    },
+    {
+      "accessLevel": "public",
+      "declarationFragments": [
+        {
+          "kind": "keyword",
+          "spelling": "enum"
+        },
+        {
+          "kind": "text",
+          "spelling": ": "
+        },
+        {
+          "kind": "typeIdentifier",
+          "preciseIdentifier": "c:i",
+          "spelling": "unsigned int"
+        }
+      ],
+      "identifier": {
+        "interfaceLanguage": "c",
+        "precise": "c:@Ea@Constant"
+      },
+      "kind": {
+        "displayName": "Enumeration",
+        "identifier": "c.enum"
+      },
+      "location": {
+        "position": {
+          "character": 1,
+          "line": 17
+        },
+        "uri": "file:///Users/dgrumberg/VersionControlledDocuments/oss/llvm-project/build/tools/clang/test/ExtractAPI/Output/enum.c.tmp/input.h"
+      },
+      "names": {
+        "navigator": [
+          {
+            "kind": "identifier",
+            "spelling": "(anonymous)"
+          }
+        ],
+        "title": "(anonymous)"
+      },
+      "pathComponents": [
+        "(anonymous)"
+      ]
+    },
+    {
+      "accessLevel": "public",
+      "declarationFragments": [
+        {
+          "kind": "identifier",
+          "spelling": "Constant"
+        }
+      ],
+      "identifier": {
+        "interfaceLanguage": "c",
+        "precise": "c:@Ea@Constant@Constant"
+      },
+      "kind": {
+        "displayName": "Enumeration Case",
+        "identifier": "c.enum.case"
+      },
+      "location": {
+        "position": {
+          "character": 3,
+          "line": 18
+        },
+        "uri": "file:///Users/dgrumberg/VersionControlledDocuments/oss/llvm-project/build/tools/clang/test/ExtractAPI/Output/enum.c.tmp/input.h"
+      },
+      "names": {
+        "navigator": [
+          {
+            "kind": "identifier",
+            "spelling": "Constant"
+          }
+        ],
+        "subHeading": [
+          {
+            "kind": "identifier",
+            "spelling": "Constant"
+          }
+        ],
+        "title": "Constant"
+      },
+      "pathComponents": [
+        "(anonymous)",
+        "Constant"
+      ]
     }
   ]
 }