[Compile Time Constant Extraction] Add extraction of paren expressions (#62816)

Author: jPaolantonio

Diff for: lib/ConstExtract/ConstExtract.cpp

@@ -203,6 +203,11 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
       return extractCompileTimeValue(erasureExpr->getSubExpr());
     }
 
+    case ExprKind::Paren: {
+      auto parenExpr = cast<ParenExpr>(expr);
+      return extractCompileTimeValue(parenExpr->getSubExpr());
+    }
+
     default: {
       break;
     }
@@ -254,9 +259,10 @@ extractTypePropertyInfo(VarDecl *propertyDecl) {
 
   if (auto accessorDecl = propertyDecl->getAccessor(AccessorKind::Get)) {
     auto node = accessorDecl->getTypecheckedBody()->getFirstElement();
-    if (node.is<Stmt *>()) {
-      if (auto returnStmt = dyn_cast<ReturnStmt>(node.get<Stmt *>())) {
-        return {propertyDecl, extractCompileTimeValue(returnStmt->getResult())};
+    if (auto *stmt = node.dyn_cast<Stmt *>()) {
+      if (stmt->getKind() == StmtKind::Return) {
+        return {propertyDecl,
+                extractCompileTimeValue(cast<ReturnStmt>(stmt)->getResult())};
       }
     }
   }

Diff for: test/ConstExtraction/ExtractLiterals.swift

@@ -68,6 +68,21 @@
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "42.2"
+// CHECK-NEXT:      },
+// CHECK-NEXT:      {
+// CHECK-NEXT:        "label": "float2",
+// CHECK-NEXT:        "type": "Swift.Float",
+// CHECK-NEXT:        "isStatic": "true",
+// CHECK-NEXT:        "isComputed": "true",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
+// CHECK-NEXT:        "value": "6"
+// CHECK-NEXT:      },
+// CHECK-NEXT:      {
+// CHECK-NEXT:        "label": "float3",
+// CHECK-NEXT:        "type": "Swift.Float",
+// CHECK-NEXT:        "isStatic": "true",
+// CHECK-NEXT:        "isComputed": "true",
+// CHECK-NEXT:        "valueKind": "Runtime"
 // CHECK-NEXT:      }
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  },
@@ -82,6 +97,22 @@
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "\"Hello, World\""
+// CHECK-NEXT:      },
+// CHECK-NEXT:      {
+// CHECK-NEXT:        "label": "string2",
+// CHECK-NEXT:        "type": "Swift.String",
+// CHECK-NEXT:        "isStatic": "false",
+// CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
+// CHECK-NEXT:        "value": "\"Hi\""
+// CHECK-NEXT:      },
+// CHECK-NEXT:      {
+// CHECK-NEXT:        "label": "string3",
+// CHECK-NEXT:        "type": "Swift.String",
+// CHECK-NEXT:        "isStatic": "false",
+// CHECK-NEXT:        "isComputed": "true",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
+// CHECK-NEXT:        "value": "\"Hey\""
 // CHECK-NEXT:      }
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  },
@@ -215,10 +246,14 @@ public struct Ints : MyProto {
 
 public struct Floats : MyProto {
     static let float1: Float = 42.2
+    static var float2: Float { return (6) }
+    static var float3: Float { return (1 + 2) }
 }
 
 public struct Strings : MyProto {
     let string1: String = "Hello, World"
+    let string2: String = (("Hi"))
+    var string3: String { ("Hey") }
 }
 
 public struct PropertyWrappers : MyProto {