From fb3a0b7add3e10e06357a8a7718a43c6078a1b8a Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Thu, 26 Nov 2020 18:15:47 +0000
Subject: [PATCH] Use new JS Map/Set APIs in the serializer

Patch by: Itms (for the most part)
Refs #5860

Differential Revision: https://code.wildfiregames.com/D3146
This was SVN commit r24266.
---
 .../serialization/BinarySerializer.cpp        | 132 +++++++++---------
 .../serialization/StdDeserializer.cpp         |  11 +-
 2 files changed, 72 insertions(+), 71 deletions(-)

diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
index 0e0617ad2b..62ca427dd3 100644
--- a/source/simulation2/serialization/BinarySerializer.cpp
+++ b/source/simulation2/serialization/BinarySerializer.cpp
@@ -97,8 +97,11 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
 			break;
 		}
 
-		// Arrays are special cases of Object
+		// Arrays, Maps and Sets are special cases of Objects
 		bool isArray;
+		bool isMap;
+		bool isSet;
+
 		if (JS_IsArrayObject(rq.cx, obj, &isArray) && isArray)
 		{
 			m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_ARRAY);
@@ -141,6 +144,70 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
 			m_Serializer.RawBytes("buffer data", (const u8*)JS_GetArrayBufferData(obj, &sharedMemory, nogc), length);
 			break;
 		}
+
+		else if (JS::IsMapObject(rq.cx, obj, &isMap) && isMap)
+		{
+			m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_MAP);
+			m_Serializer.NumberU32_Unbounded("map size", JS::MapSize(rq.cx, obj));
+
+			JS::RootedValue keyValueIterator(rq.cx);
+			if (!JS::MapEntries(rq.cx, obj, &keyValueIterator))
+				throw PSERROR_Serialize_ScriptError("JS::MapEntries failed");
+
+			JS::ForOfIterator it(rq.cx);
+			if (!it.init(keyValueIterator))
+				throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::init failed");
+
+			JS::RootedValue keyValuePair(rq.cx);
+			bool done;
+			while (true)
+			{
+				if (!it.next(&keyValuePair, &done))
+					throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::next failed");
+
+				if (done)
+					break;
+
+				JS::RootedObject keyValuePairObj(rq.cx, &keyValuePair.toObject());
+				JS::RootedValue key(rq.cx);
+				JS::RootedValue value(rq.cx);
+				ENSURE(JS_GetElement(rq.cx, keyValuePairObj, 0, &key));
+				ENSURE(JS_GetElement(rq.cx, keyValuePairObj, 1, &value));
+
+				HandleScriptVal(key);
+				HandleScriptVal(value);
+			}
+			break;
+		}
+
+		else if (JS::IsSetObject(rq.cx, obj, &isSet) && isSet)
+		{
+			m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_SET);
+			m_Serializer.NumberU32_Unbounded("set size", JS::SetSize(rq.cx, obj));
+
+			JS::RootedValue valueIterator(rq.cx);
+			if (!JS::SetValues(rq.cx, obj, &valueIterator))
+				throw PSERROR_Serialize_ScriptError("JS::SetValues failed");
+
+			JS::ForOfIterator it(rq.cx);
+			if (!it.init(valueIterator))
+				throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::init failed");
+
+			JS::RootedValue value(rq.cx);
+			bool done;
+			while (true)
+			{
+				if (!it.next(&value, &done))
+					throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::next failed");
+
+				if (done)
+					break;
+
+				HandleScriptVal(value);
+			}
+			break;
+		}
+
 		else
 		{
 			// Find type of object
@@ -186,69 +253,6 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
 				m_Serializer.Bool("value", b);
 				break;
 			}
-			// TODO: Follow upstream progresses about a JS::IsMapObject
-			// https://bugzilla.mozilla.org/show_bug.cgi?id=1285909
-			else if (protokey == JSProto_Map)
-			{
-				m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_MAP);
-				m_Serializer.NumberU32_Unbounded("map size", JS::MapSize(rq.cx, obj));
-
-				JS::RootedValue keyValueIterator(rq.cx);
-				if (!JS::MapEntries(rq.cx, obj, &keyValueIterator))
-					throw PSERROR_Serialize_ScriptError("JS::MapEntries failed");
-
-				JS::ForOfIterator it(rq.cx);
-				if (!it.init(keyValueIterator))
-					throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::init failed");
-
-				JS::RootedValue keyValuePair(rq.cx);
-				bool done;
-				while (true)
-				{
-					if (!it.next(&keyValuePair, &done))
-						throw PSERROR_Serialize_ScriptError("JS::ForOfIterator::next failed");
-
-					if (done)
-						break;
-
-					JS::RootedObject keyValuePairObj(rq.cx, &keyValuePair.toObject());
-					JS::RootedValue key(rq.cx);
-					JS::RootedValue value(rq.cx);
-					ENSURE(JS_GetElement(rq.cx, keyValuePairObj, 0, &key));
-					ENSURE(JS_GetElement(rq.cx, keyValuePairObj, 1, &value));
-
-					HandleScriptVal(key);
-					HandleScriptVal(value);
-				}
-				break;
-			}
-			// TODO: Follow upstream progresses about a JS::IsSetObject
-			// https://bugzilla.mozilla.org/show_bug.cgi?id=1285909
-			else if (protokey == JSProto_Set)
-			{
-				// TODO: When updating SpiderMonkey to a release after 38 use the C++ API for Sets.
-				// https://bugzilla.mozilla.org/show_bug.cgi?id=1159469
-				u32 setSize;
-				m_ScriptInterface.GetProperty(val, "size", setSize);
-
-				m_Serializer.NumberU8_Unbounded("type", SCRIPT_TYPE_OBJECT_SET);
-				m_Serializer.NumberU32_Unbounded("set size", setSize);
-
-				JS::RootedValue valueIterator(rq.cx);
-				m_ScriptInterface.CallFunction(val, "values", &valueIterator);
-				for (u32 i=0; i<setSize; ++i)
-				{
-					JS::RootedValue currentIterator(rq.cx);
-					JS::RootedValue value(rq.cx);
-					ENSURE(m_ScriptInterface.CallFunction(valueIterator, "next", &currentIterator));
-
-					m_ScriptInterface.GetProperty(currentIterator, "value", &value);
-
-					HandleScriptVal(value);
-				}
-
-				break;
-			}
 			else
 			{
 				// Unrecognized class
diff --git a/source/simulation2/serialization/StdDeserializer.cpp b/source/simulation2/serialization/StdDeserializer.cpp
index 1635aa7427..926550bb63 100644
--- a/source/simulation2/serialization/StdDeserializer.cpp
+++ b/source/simulation2/serialization/StdDeserializer.cpp
@@ -359,11 +359,8 @@ JS::Value CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleOb
 	}
 	case SCRIPT_TYPE_OBJECT_SET:
 	{
-		JS::RootedValue setVal(rq.cx);
-		m_ScriptInterface.Eval("(new Set())", &setVal);
-
-		JS::RootedObject setObj(rq.cx, &setVal.toObject());
-		AddScriptBackref(setObj);
+		JS::RootedObject obj(rq.cx, JS::NewSetObject(rq.cx));
+		AddScriptBackref(obj);
 
 		u32 setSize;
 		NumberU32_Unbounded("set size", setSize);
@@ -371,10 +368,10 @@ JS::Value CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleOb
 		for (u32 i=0; i<setSize; ++i)
 		{
 			JS::RootedValue value(rq.cx, ReadScriptVal("set value", nullptr));
-			m_ScriptInterface.CallFunctionVoid(setVal, "add", value);
+			JS::SetAdd(rq.cx, obj, value);
 		}
 
-		return setVal;
+		return JS::ObjectValue(*obj);
 	}
 	default:
 		throw PSERROR_Deserialize_OutOfBounds();