Replace std::vector to plain C array for register roots

anydream · anydream · commit 65844c51e15c · 2017-12-28T22:10:55.000+08:00
diff --git a/il2cpp/GeneratorContext.cs b/il2cpp/GeneratorContext.cs
@@ -301,20 +301,25 @@ private CompileUnit GenInitUnit(Dictionary<string, string> transMap)
 				{
 					if (item.Item2)
 					{
-						prtGC.AppendFormatLine("IL2CPP_ADD_ROOT({0});", item.Item1);
+						prtGC.AppendFormatLine("IL2CPP_ADD_ROOT({0}),", item.Item1);
 						addedRoots = true;
 					}
 					prtInit.AppendFormatLine("{0} = {{}};", item.Item1);
 				}
 			}
 
-			if (addedRoots)
-				prtGC.AppendLine("il2cpp_CommitRoots();");
-
 			CodePrinter prtFunc = new CodePrinter();
 			prtFunc.AppendLine("void il2cpp_InitVariables()\n{");
 			++prtFunc.Indents;
-			prtFunc.Append(prtGC.ToString());
+			if (addedRoots)
+			{
+				prtFunc.AppendLine("il2cppRootItem roots[] =\n{");
+				++prtFunc.Indents;
+				prtFunc.Append(prtGC.ToString());
+				--prtFunc.Indents;
+				prtFunc.AppendLine("};");
+				prtFunc.AppendLine("il2cpp_CommitRoots(roots, sizeof(roots) / sizeof(roots[0]));");
+			}
 			prtFunc.Append(prtInit.ToString());
 			--prtFunc.Indents;
 			prtFunc.AppendLine("}");
diff --git a/runtime/il2cpp.cpp b/runtime/il2cpp.cpp
@@ -2,7 +2,6 @@
 #include "il2cppGC.h"
 #include "il2cppBridge.h"
 #include <math.h>
-#include <vector>
 #include <algorithm>
 
 #if defined(_WIN32)
@@ -59,55 +58,36 @@ void* il2cpp_New(uint32_t sz, uint32_t typeID, uint8_t isNoRef, IL2CPP_FINALIZER
 	return obj;
 }
 
-struct GCRootItem
+void il2cpp_CommitRoots(il2cppRootItem* roots, uint32_t num)
 {
-	uint8_t* Start;
-	uint32_t Length;
-
-	GCRootItem(uint8_t* start, uint32_t len)
-		: Start(start)
-		, Length(len)
+	std::sort(roots, roots + num,
+		[](const il2cppRootItem& lhs, const il2cppRootItem& rhs)
 	{
-	}
-};
-
-static std::vector<GCRootItem> g_Roots;
-void il2cpp_AddRoot(void* ptr, uint32_t len)
-{
-	g_Roots.emplace_back(static_cast<uint8_t*>(ptr), len);
-}
-
-void il2cpp_CommitRoots()
-{
-	std::sort(g_Roots.begin(), g_Roots.end(),
-		[](const GCRootItem& lhs, const GCRootItem& rhs)
-	{
-		return lhs.Start < rhs.Start;
+		return lhs.Ptr < rhs.Ptr;
 	});
 
 	uint8_t* start = nullptr;
 	uint8_t* end = nullptr;
-	for (const auto& item : g_Roots)
+	for (const il2cppRootItem* itEnd = roots + num;
+		roots < itEnd;
+		++roots)
 	{
+		const il2cppRootItem& item = *roots;
 		if (start)
 		{
-			if (item.Start <= end)
+			if (item.Ptr <= end)
 			{
 				end += item.Length;
 				continue;
 			}
 			il2cpp_GC_AddRoots(start, end);
 		}
 
-		start = item.Start;
-		end = item.Start + item.Length;
+		start = item.Ptr;
+		end = item.Ptr + item.Length;
 	}
 	if (start)
 		il2cpp_GC_AddRoots(start, end);
-
-	g_Roots.clear();
-	g_Roots.reserve(0);
-	auto tmp = std::move(g_Roots);
 }
 
 void il2cpp_Yield()
diff --git a/runtime/il2cpp.h b/runtime/il2cpp.h
@@ -42,7 +42,7 @@
 #define IL2CPP_MEMCMP					memcmp
 #define IL2CPP_ALLOCA					alloca
 #define IL2CPP_NEW						il2cpp_New
-#define IL2CPP_ADD_ROOT(_x)				il2cpp_AddRoot(&(_x), sizeof(_x))
+#define IL2CPP_ADD_ROOT(_x)				il2cppRootItem(&(_x), sizeof(_x))
 #define IL2CPP_THROW(_ex)				throw il2cppException(_ex)
 #define IL2CPP_THROW_INVALIDCAST		do { il2cpp_ThrowInvalidCast(); IL2CPP_UNREACHABLE; } while(0)
 
@@ -178,13 +178,23 @@ struct il2cppFieldInfo
 	uint32_t Offset;
 };
 
+struct il2cppRootItem
+{
+	uint8_t* Ptr;
+	uint32_t Length;
+
+	il2cppRootItem(const void* ptr, uint32_t len)
+		: Ptr((uint8_t*)ptr)
+		, Length(len)
+	{}
+};
+
 using IL2CPP_FINALIZER_FUNC = void(*)(cls_Object*);
 
 void il2cpp_Init();
 void* il2cpp_New(uint32_t sz, uint32_t typeID, uint8_t isNoRef);
 void* il2cpp_New(uint32_t sz, uint32_t typeID, uint8_t isNoRef, IL2CPP_FINALIZER_FUNC finalizer);
-void il2cpp_AddRoot(void* ptr, uint32_t len);
-void il2cpp_CommitRoots();
+void il2cpp_CommitRoots(il2cppRootItem* roots, uint32_t num);
 void il2cpp_Yield();
 void il2cpp_SleepMS(uint32_t ms);
 uintptr_t il2cpp_ThreadID();
