Address PR feedback, including narrowing element type of DictionaryValue to TupleValue.

Author: Quinn Taylor

include/swift/AST/ConstTypeInfo.h

@@ -102,24 +102,6 @@ class BuilderValue : public CompileTimeValue {
   std::vector<CompileTimeValue> Members;
 };
 
-/// A dictionary literal value representation
-class DictionaryValue : public CompileTimeValue {
-public:
-  DictionaryValue(std::vector<std::shared_ptr<CompileTimeValue>> elements)
-      : CompileTimeValue(ValueKind::Dictionary), elements(elements) {}
-
-  static bool classof(const CompileTimeValue *T) {
-    return T->getKind() == ValueKind::Dictionary;
-  }
-
-  std::vector<std::shared_ptr<CompileTimeValue>> getElements() const {
-    return elements;
-  }
-
-private:
-  std::vector<std::shared_ptr<CompileTimeValue>> elements;
-};
-
 struct TupleElement {
   Optional<std::string> Label;
   swift::Type Type;
@@ -159,6 +141,24 @@ class ArrayValue : public CompileTimeValue {
   std::vector<std::shared_ptr<CompileTimeValue>> Elements;
 };
 
+/// A dictionary literal value representation
+class DictionaryValue : public CompileTimeValue {
+public:
+  DictionaryValue(std::vector<std::shared_ptr<TupleValue>> elements)
+      : CompileTimeValue(ValueKind::Dictionary), Elements(elements) {}
+
+  static bool classof(const CompileTimeValue *T) {
+    return T->getKind() == ValueKind::Dictionary;
+  }
+
+  std::vector<std::shared_ptr<TupleValue>> getElements() const {
+    return Elements;
+  }
+
+private:
+  std::vector<std::shared_ptr<TupleValue>> Elements;
+};
+
 /// A representation of an arbitrary value that does not fall under
 /// any of the above categories.
 class RuntimeValue : public CompileTimeValue {

lib/ConstExtract/ConstExtract.cpp

@@ -148,12 +148,12 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
 
     case ExprKind::Dictionary: {
       auto dictionaryExpr = cast<DictionaryExpr>(expr);
-      std::vector<std::shared_ptr<CompileTimeValue>> elementValues;
-      for (unsigned n = dictionaryExpr->getNumElements(), i = 0; i != n; i++) {
-        auto elementExpr = dictionaryExpr->getElement(i);
-        elementValues.push_back(extractCompileTimeValue(elementExpr));
+      std::vector<std::shared_ptr<TupleValue>> tuples;
+      for (auto elementExpr : dictionaryExpr->getElements()) {
+        auto elementValue = extractCompileTimeValue(elementExpr);
+        tuples.push_back(std::static_pointer_cast<TupleValue>(elementValue));
       }
-      return std::make_shared<DictionaryValue>(elementValues);
+      return std::make_shared<DictionaryValue>(tuples);
     }
 
     case ExprKind::Tuple: {
@@ -392,8 +392,8 @@ void writeValue(llvm::json::OStream &JSON,
   case CompileTimeValue::ValueKind::Dictionary: {
     JSON.attribute("valueKind", "Dictionary");
     JSON.attributeArray("value", [&] {
-      for (auto element : cast<DictionaryValue>(value)->getElements()) {
-        auto tupleElements = cast<TupleValue>(element.get())->getElements();
+      for (auto tupleValue : cast<DictionaryValue>(value)->getElements()) {
+        auto tupleElements = tupleValue.get()->getElements();
         JSON.object([&] {
           JSON.attributeObject(
               "key", [&] { writeValue(JSON, tupleElements[0].Value); });