From a27fbfd45f09da550bd3f5336f603cc1d49a3a3b Mon Sep 17 00:00:00 2001
From: Idan Horowitz <idan.horowitz@gmail.com>
Date: Wed, 16 Jun 2021 00:00:26 +0300
Subject: [PATCH] LibJS: Use OrderedHashMap instead of HashMap in the Map
 built-in

This ensures insertion-order iteration.
---
 Userland/Libraries/LibJS/Runtime/Map.h         | 6 +++---
 Userland/Libraries/LibJS/Runtime/MapIterator.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Userland/Libraries/LibJS/Runtime/Map.h b/Userland/Libraries/LibJS/Runtime/Map.h
index c154011349..77f7b486da 100644
--- a/Userland/Libraries/LibJS/Runtime/Map.h
+++ b/Userland/Libraries/LibJS/Runtime/Map.h
@@ -22,13 +22,13 @@ public:
     explicit Map(Object& prototype);
     virtual ~Map() override;
 
-    HashMap<Value, Value, ValueTraits> const& entries() const { return m_entries; };
-    HashMap<Value, Value, ValueTraits>& entries() { return m_entries; };
+    OrderedHashMap<Value, Value, ValueTraits> const& entries() const { return m_entries; };
+    OrderedHashMap<Value, Value, ValueTraits>& entries() { return m_entries; };
 
 private:
     virtual void visit_edges(Visitor& visitor) override;
 
-    HashMap<Value, Value, ValueTraits> m_entries; // FIXME: Replace with a HashMap that maintains a linked list of insertion order for correct iteration order
+    OrderedHashMap<Value, Value, ValueTraits> m_entries;
 };
 
 }
diff --git a/Userland/Libraries/LibJS/Runtime/MapIterator.h b/Userland/Libraries/LibJS/Runtime/MapIterator.h
index 39674b37d1..c1cb75aa04 100644
--- a/Userland/Libraries/LibJS/Runtime/MapIterator.h
+++ b/Userland/Libraries/LibJS/Runtime/MapIterator.h
@@ -33,7 +33,7 @@ private:
     Map& m_map;
     bool m_done { false };
     Object::PropertyKind m_iteration_kind;
-    HashMap<Value, Value, ValueTraits>::IteratorType m_iterator;
+    OrderedHashMap<Value, Value, ValueTraits>::IteratorType m_iterator;
 };
 
 }