From f050dbfcf028a6c85a72349e5411656e72fdcb25 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Wed, 6 Feb 2019 01:22:11 +0100
Subject: [PATCH] Move a very long loop into its own function as it was
 expanded and executed hundreds times inside the spawnfunc macro (server: qc
 -2.5MB, dat -1.8MB!)

---
 qcsrc/lib/spawnfunc.qh | 110 +++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 54 deletions(-)

diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index 41d8a1396..0c076a224 100644
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -81,58 +81,6 @@ noref bool require_spawnfunc_prefix;
         e.__spawnfunc_constructor(e);
     }
 
-	noref bool __spawnfunc_first;
-
-	#define spawnfunc_1(id) spawnfunc_2(id, FIELDS_UNION)
-	#define spawnfunc_2(id, whitelist) \
-		void __spawnfunc_##id(entity this); \
-		ACCUMULATE void spawnfunc_##id(entity this) \
-		{ \
-		    if (!__spawnfunc_first) { \
-                __spawnfunc_first = true; \
-                static_init_early(); \
-		    } \
-		    bool dospawn = true; \
-		    if (__spawnfunc_expecting > 1) { __spawnfunc_expecting = 0; } \
-			else if (__spawnfunc_expecting) { \
-				/* engine call */ \
-                if (!g_spawn_queue) { g_spawn_queue = IL_NEW(); } \
-				__spawnfunc_expecting = 0; \
-				this = __spawnfunc_expect; \
-				__spawnfunc_expect = NULL; \
-                dospawn = false; \
-			} else { \
-			    /* userland call */ \
-				assert(this); \
-			} \
-			if (!this.sourceLoc) { \
-				this.sourceLoc = __FILE__ ":" STR(__LINE__); \
-			} \
-			if (!this.spawnfunc_checked) { \
-				for (int i = 0, n = numentityfields(); i < n; ++i) { \
-					string value = getentityfieldstring(i, this); \
-					string s = entityfieldname(i); \
-					whitelist(_spawnfunc_checktypes) \
-					if (value == "") continue; \
-					if (s == "") continue; \
-					FIELDS_COMMON(_spawnfunc_check) \
-					whitelist(_spawnfunc_check) \
-					LOG_WARNF(_("Entity field %s.%s (%s) is not whitelisted. If you believe this is an error, please file an issue."), #id, s, value); \
-				} \
-				this.spawnfunc_checked = true; \
-				if (this) { \
-                    /* not worldspawn, delay spawn */ \
-                    __spawnfunc_defer(this, __spawnfunc_##id); \
-                } else { \
-                    /* world might not be "worldspawn" */ \
-                    this.__spawnfunc_constructor = __spawnfunc_##id; \
-                } \
-			} \
-			if (dospawn) { __spawnfunc_##id(this); } \
-			if (__spawnfunc_unreachable_workaround) return; \
-		} \
-		void __spawnfunc_##id(entity this)
-
 	#define FIELD_SCALAR(fld, n) \
 		fld(n)
 	#define FIELD_VEC(fld, n) \
@@ -273,5 +221,59 @@ noref bool require_spawnfunc_prefix;
 		FIELD_VEC(fld, velocity) \
 		/**/
 
-	#define spawnfunc(...) EVAL_spawnfunc(OVERLOAD(spawnfunc, __VA_ARGS__))
-	#define EVAL_spawnfunc(...) __VA_ARGS__
+void _checkWhitelisted(entity this, string id)
+{
+	for (int i = 0, n = numentityfields(); i < n; ++i)
+	{
+		string value = getentityfieldstring(i, this);
+		string s = entityfieldname(i);
+		FIELDS_UNION(_spawnfunc_checktypes)
+		if (value == "") continue;
+		if (s == "") continue;
+		FIELDS_COMMON(_spawnfunc_check)
+		FIELDS_UNION(_spawnfunc_check)
+		LOG_WARNF(_("Entity field %s.%s (%s) is not whitelisted. If you believe this is an error, please file an issue."), id, s, value);
+	}
+}
+
+noref bool __spawnfunc_first;
+
+#define spawnfunc(id) \
+	void __spawnfunc_##id(entity this); \
+	ACCUMULATE void spawnfunc_##id(entity this) \
+	{ \
+		if (!__spawnfunc_first) { \
+			__spawnfunc_first = true; \
+			static_init_early(); \
+		} \
+		bool dospawn = true; \
+		if (__spawnfunc_expecting > 1) { __spawnfunc_expecting = 0; } \
+		else if (__spawnfunc_expecting) { \
+			/* engine call */ \
+			if (!g_spawn_queue) { g_spawn_queue = IL_NEW(); } \
+			__spawnfunc_expecting = 0; \
+			this = __spawnfunc_expect; \
+			__spawnfunc_expect = NULL; \
+			dospawn = false; \
+		} else { \
+			/* userland call */ \
+			assert(this); \
+		} \
+		if (!this.sourceLoc) { \
+			this.sourceLoc = __FILE__ ":" STR(__LINE__); \
+		} \
+		if (!this.spawnfunc_checked) { \
+			_checkWhitelisted(this, #id); \
+			this.spawnfunc_checked = true; \
+			if (this) { \
+				/* not worldspawn, delay spawn */ \
+				__spawnfunc_defer(this, __spawnfunc_##id); \
+			} else { \
+				/* world might not be "worldspawn" */ \
+				this.__spawnfunc_constructor = __spawnfunc_##id; \
+			} \
+		} \
+		if (dospawn) { __spawnfunc_##id(this); } \
+		if (__spawnfunc_unreachable_workaround) return; \
+	} \
+	void __spawnfunc_##id(entity this)
-- 
2.39.2