diff --git a/include/swift/ConstExtract/ConstExtract.h b/include/swift/ConstExtract/ConstExtract.h
index f58b070f0acc1..d8bb343868a17 100644
--- a/include/swift/ConstExtract/ConstExtract.h
+++ b/include/swift/ConstExtract/ConstExtract.h
@@ -1,8 +1,8 @@
-//===-------- ConstExtract.h -- Gather Compile-Time-Known Values ----------===//
+//===---- ConstExtract.h -- Gather Compile-Time-Known Values ----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2022 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
diff --git a/lib/ConstExtract/ConstExtract.cpp b/lib/ConstExtract/ConstExtract.cpp
index 1e16013fe5c12..1ac04ab033183 100644
--- a/lib/ConstExtract/ConstExtract.cpp
+++ b/lib/ConstExtract/ConstExtract.cpp
@@ -1,8 +1,8 @@
-//===-------- ConstExtract.pp -- Gather Compile-Time-Known Values --------===//
+//===-------- ConstExtract.cpp -- Gather Compile-Time-Known Values --------===//
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2022 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -222,6 +222,21 @@ std::string toString(const CompileTimeValue *Value) {
   }
 }
 
+std::string toString(CompileTimeValue::ValueKind Kind) {
+  switch (Kind) {
+    case CompileTimeValue::ValueKind::RawLiteral:
+      return "RawLiteral";
+    case CompileTimeValue::ValueKind::InitCall:
+      return "InitCall";
+    case CompileTimeValue::ValueKind::Builder:
+      return "Builder";
+    case CompileTimeValue::ValueKind::Dictionary:
+      return "Dictionary";
+    case CompileTimeValue::ValueKind::Runtime:
+      return "Runtime";
+  }
+}
+
 bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
                        llvm::raw_fd_ostream &OS) {
   llvm::json::OStream JSON(OS, 2);
@@ -244,7 +259,12 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
                              PropertyDecl->isStatic() ? "true" : "false");
               JSON.attribute("isComputed",
                              !PropertyDecl->hasStorage() ? "true" : "false");
-              JSON.attribute("value", toString(PropertyInfo.Value.get()));
+              auto value = PropertyInfo.Value.get();
+              auto valueKind = value->getKind();
+              JSON.attribute("valueKind", toString(valueKind));
+              if (valueKind != CompileTimeValue::ValueKind::Runtime) {
+                JSON.attribute("value", toString(value));
+              }
             });
           }
         });
diff --git a/test/ConstExtraction/fields.swift b/test/ConstExtraction/fields.swift
index de109e6308800..9b61c79f65db0 100644
--- a/test/ConstExtraction/fields.swift
+++ b/test/ConstExtraction/fields.swift
@@ -15,6 +15,7 @@
 // CHECK-NEXT:        "type": "Swift.String",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "\"Hello, World\""
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -22,6 +23,7 @@
 // CHECK-NEXT:        "type": "[Swift.Int]",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "[1, 2, 3, 4, 5, 6, 7, 8, 9]"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -29,6 +31,7 @@
 // CHECK-NEXT:        "type": "Swift.Bool",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "false"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -36,6 +39,7 @@
 // CHECK-NEXT:        "type": "Swift.Bool?",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "nil"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -43,6 +47,7 @@
 // CHECK-NEXT:        "type": "(Swift.Int, Swift.Float)",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "(42, 6.6)"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -50,6 +55,7 @@
 // CHECK-NEXT:        "type": "[Swift.String : Swift.Int]",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "[(\"One\", 1), (\"Two\", 2), (\"Three\", 3)]"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -57,6 +63,7 @@
 // CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "11"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -64,6 +71,7 @@
 // CHECK-NEXT:        "type": "Swift.Float",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "42.2"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -71,6 +79,7 @@
 // CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "true",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "3"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
@@ -78,6 +87,7 @@
 // CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "true",
+// CHECK-NEXT:        "valueKind": "RawLiteral",
 // CHECK-NEXT:        "value": "3"
 // CHECK-NEXT:      }
 // CHECK-NEXT:    ]