[Compile Time Constant Extraction] Extract Property Wrapper Line + File Information (#63195)

Author: jPaolantonio

include/swift/AST/ConstTypeInfo.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_AST_CONST_TYPE_INFO_H
 #define SWIFT_AST_CONST_TYPE_INFO_H
 
+#include "swift/AST/Attr.h"
 #include "swift/AST/Type.h"
 #include <memory>
 #include <string>
@@ -194,7 +195,7 @@ class RuntimeValue : public CompileTimeValue {
 };
 
 struct CustomAttrValue {
-  swift::Type Type;
+  swift::CustomAttr *Attr;
   std::vector<FunctionParameter> Parameters;
 };
 

lib/ConstExtract/ConstExtract.cpp

@@ -325,7 +325,8 @@ extractCustomAttrValues(VarDecl *propertyDecl) {
             {label, argExpr->getType(), extractCompileTimeValue(argExpr)});
       }
     }
-    customAttrValues.push_back({propertyWrapper->getType(), parameters});
+
+    customAttrValues.push_back({propertyWrapper, parameters});
   }
 
   return customAttrValues;
@@ -458,29 +459,14 @@ gatherConstValuesForPrimary(const std::unordered_set<std::string> &Protocols,
   return Result;
 }
 
-void writeFileInformation(llvm::json::OStream &JSON, const VarDecl *VD) {
-  SourceRange sourceRange = VD->getSourceRange();
-  if (sourceRange.isInvalid())
-    return;
-
-  const ASTContext &ctx = VD->getDeclContext()->getASTContext();
-  JSON.attribute("file", ctx.SourceMgr.getDisplayNameForLoc(sourceRange.Start));
-  JSON.attribute(
-      "line",
-      ctx.SourceMgr.getPresumedLineAndColumnForLoc(sourceRange.Start).first);
-}
-
-void writeFileInformation(llvm::json::OStream &JSON,
-                          const NominalTypeDecl *NTD) {
-  DeclContext *DC = NTD->getInnermostDeclContext();
-  SourceLoc loc = extractNearestSourceLoc(DC);
-  if (loc.isInvalid())
+void writeLocationInformation(llvm::json::OStream &JSON, SourceLoc Loc,
+                              const ASTContext &ctx) {
+  if (Loc.isInvalid())
     return;
 
-  const ASTContext &ctx = DC->getASTContext();
-  JSON.attribute("file", ctx.SourceMgr.getDisplayNameForLoc(loc));
+  JSON.attribute("file", ctx.SourceMgr.getDisplayNameForLoc(Loc));
   JSON.attribute("line",
-                 ctx.SourceMgr.getPresumedLineAndColumnForLoc(loc).first);
+                 ctx.SourceMgr.getPresumedLineAndColumnForLoc(Loc).first);
 }
 
 void writeValue(llvm::json::OStream &JSON,
@@ -592,17 +578,20 @@ void writeValue(llvm::json::OStream &JSON,
   }
 }
 
-void writeAttributes(
+void writePropertyWrapperAttributes(
     llvm::json::OStream &JSON,
-    llvm::Optional<std::vector<CustomAttrValue>> PropertyWrappers) {
+    llvm::Optional<std::vector<CustomAttrValue>> PropertyWrappers,
+    const ASTContext &ctx) {
   if (!PropertyWrappers.has_value()) {
     return;
   }
 
-  JSON.attributeArray("attributes", [&] {
+  JSON.attributeArray("propertyWrappers", [&] {
     for (auto PW : PropertyWrappers.value()) {
       JSON.object([&] {
-        JSON.attribute("type", toFullyQualifiedTypeNameString(PW.Type));
+        JSON.attribute("type",
+                       toFullyQualifiedTypeNameString(PW.Attr->getType()));
+        writeLocationInformation(JSON, PW.Attr->getLocation(), ctx);
         JSON.attributeArray("arguments", [&] {
           for (auto FP : PW.Parameters) {
             JSON.object([&] {
@@ -730,7 +719,9 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
             "kind",
             TypeDecl->getDescriptiveKindName(TypeDecl->getDescriptiveKind())
                 .str());
-        writeFileInformation(JSON, TypeDecl);
+        writeLocationInformation(
+            JSON, extractNearestSourceLoc(TypeDecl->getInnermostDeclContext()),
+            TypeDecl->getInnermostDeclContext()->getASTContext());
         JSON.attributeArray("properties", [&] {
           for (const auto &PropertyInfo : TypeInfo.Properties) {
             JSON.object([&] {
@@ -741,9 +732,11 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
               JSON.attribute("isStatic", decl->isStatic() ? "true" : "false");
               JSON.attribute("isComputed",
                              !decl->hasStorage() ? "true" : "false");
-              writeFileInformation(JSON, decl);
+              writeLocationInformation(JSON, decl->getLoc(),
+                                       decl->getDeclContext()->getASTContext());
               writeValue(JSON, PropertyInfo.Value);
-              writeAttributes(JSON, PropertyInfo.PropertyWrappers);
+              writePropertyWrapperAttributes(
+                  JSON, PropertyInfo.PropertyWrappers, decl->getASTContext());
               writeResultBuilderInformation(JSON, TypeDecl, decl);
               writeAttrInformation(JSON, decl->getAttrs());
             });

test/ConstExtraction/ExtractLiterals.swift

@@ -352,9 +352,11 @@ public struct PropertyWrappers : MyProto {
 // CHECK-NEXT:            }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:        },
-// CHECK-NEXT:        "attributes": [
+// CHECK-NEXT:        "propertyWrappers": [
 // CHECK-NEXT:          {
 // CHECK-NEXT:            "type": "ExtractLiterals.Buffered",
+// CHECK-NEXT:            "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractLiterals.swift",
+// CHECK-NEXT:            "line": 38,
 // CHECK-NEXT:            "arguments": []
 // CHECK-NEXT:          }
 // CHECK-NEXT:        ]
@@ -399,9 +401,11 @@ public struct PropertyWrappers : MyProto {
 // CHECK-NEXT:            }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:        },
-// CHECK-NEXT:        "attributes": [
+// CHECK-NEXT:        "propertyWrappers": [
 // CHECK-NEXT:          {
 // CHECK-NEXT:            "type": "ExtractLiterals.Clamping",
+// CHECK-NEXT:            "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractLiterals.swift",
+// CHECK-NEXT:            "line": 41,
 // CHECK-NEXT:            "arguments": [
 // CHECK-NEXT:              {
 // CHECK-NEXT:                "label": "min",
@@ -460,13 +464,17 @@ public struct PropertyWrappers : MyProto {
 // CHECK-NEXT:            }
 // CHECK-NEXT:          ]
 // CHECK-NEXT:        },
-// CHECK-NEXT:        "attributes": [
+// CHECK-NEXT:        "propertyWrappers": [
 // CHECK-NEXT:          {
 // CHECK-NEXT:            "type": "ExtractLiterals.Buffered",
+// CHECK-NEXT:            "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractLiterals.swift",
+// CHECK-NEXT:            "line": 44,
 // CHECK-NEXT:            "arguments": []
 // CHECK-NEXT:          },
 // CHECK-NEXT:          {
 // CHECK-NEXT:            "type": "ExtractLiterals.Clamping",
+// CHECK-NEXT:            "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractLiterals.swift",
+// CHECK-NEXT:            "line": 44,
 // CHECK-NEXT:            "arguments": [
 // CHECK-NEXT:              {
 // CHECK-NEXT:                "label": "min",