From e2ed9d13ebdf4fe2a7a7a4eacd47262310ffa3e3 Mon Sep 17 00:00:00 2001
From: cdemirer <41021322+cdemirer@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:14:09 +0800
Subject: [PATCH] Fix Array and Dictionary id() and dictionary test bug

---
 core/variant/array.cpp               | 2 +-
 core/variant/dictionary.cpp          | 2 +-
 tests/core/variant/test_dictionary.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index 45f2e0c5ac2e..4f07dbf41fc9 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -627,7 +627,7 @@ Variant Array::max() const {
 }
 
 const void *Array::id() const {
-	return _p->array.ptr();
+	return _p;
 }
 
 Array::Array(const Array &p_from, uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {
diff --git a/core/variant/dictionary.cpp b/core/variant/dictionary.cpp
index 24d21386a776..a7f07b6a7599 100644
--- a/core/variant/dictionary.cpp
+++ b/core/variant/dictionary.cpp
@@ -350,7 +350,7 @@ void Dictionary::operator=(const Dictionary &p_dictionary) {
 }
 
 const void *Dictionary::id() const {
-	return _p->variant_map.id();
+	return _p;
 }
 
 Dictionary::Dictionary(const Dictionary &p_from) {
diff --git a/tests/core/variant/test_dictionary.h b/tests/core/variant/test_dictionary.h
index 65079698a3e9..cf0709d17ae3 100644
--- a/tests/core/variant/test_dictionary.h
+++ b/tests/core/variant/test_dictionary.h
@@ -196,7 +196,7 @@ TEST_CASE("[Dictionary] Duplicate dictionary") {
 	Dictionary shallow_d = d.duplicate(false);
 	CHECK_MESSAGE(shallow_d.id() != d.id(), "Should create a new array");
 	CHECK_MESSAGE(Dictionary(shallow_d[1]).id() == Dictionary(d[1]).id(), "Should keep nested dictionary");
-	CHECK_MESSAGE(Array(shallow_d[2]).id() == Array(d[2]).id(), "Should keep nested array");
+	CHECK_MESSAGE(Array(shallow_d[k2]).id() == Array(d[k2]).id(), "Should keep nested array");
 	CHECK_EQ(shallow_d, d);
 	shallow_d[0] = 0;
 	CHECK_NE(shallow_d, d);