Merge pull request #3339 from onflow/supun/port-229

Check dictionary keys when checking the ability for dereferencing
onflow · May 14, 2024 · 282c93c · 282c93c
2 parents 25c2174 + db70473
commit 282c93c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/runtime/sema/type.go b/runtime/sema/type.go
@@ -7380,7 +7380,8 @@ func IsPrimitiveOrContainerOfPrimitive(referencedType Type) bool {
 		return IsPrimitiveOrContainerOfPrimitive(ty.Type)
 
 	case *DictionaryType:
-		return IsPrimitiveOrContainerOfPrimitive(ty.ValueType)
+		return IsPrimitiveOrContainerOfPrimitive(ty.KeyType) &&
+			IsPrimitiveOrContainerOfPrimitive(ty.ValueType)
 
 	default:
 		return ty.IsPrimitiveType()

diff --git a/runtime/tests/checker/reference_test.go b/runtime/tests/checker/reference_test.go
@@ -3512,6 +3512,23 @@ func TestCheckDereference(t *testing.T) {
               }
             `,
 		)
+
+		// Dictionaries with composite typed keys cannot be dereferenced.
+		runInvalidTestCase(
+			t,
+			"{Enum: Int}",
+			`
+                access(all) enum E:Int {
+                    access(all) case first
+                }
+
+                access(all) fun main() {
+                    var dict = {E.first: 0}
+                    var ref = &dict as &{E: Int}
+                    var deref = *ref
+                }
+            `,
+		)
 	})
 
 	runInvalidTestCase(