compile.h: make RUN_PASS's complex body into a function

Author: Hugobros3

src/shady/compile.c

@@ -87,9 +87,30 @@ void add_scheduler_source(const CompilerConfig* config, Module* dst) {
     destroy_ir_arena(get_module_arena(builtin_scheduler_mod));
 }
 
+void run_pass_impl(CompilerConfig* config, Module** pmod, IrArena* initial_arena, RewritePass pass, String pass_name) {
+    Module* old_mod = NULL;
+    old_mod = *pmod;
+    *pmod = pass(config, *pmod);
+    (*pmod)->sealed = true;
+    if (SHADY_RUN_VERIFY)
+        verify_module(config, *pmod);
+    if (get_module_arena(old_mod) != get_module_arena(*pmod) && get_module_arena(old_mod) != initial_arena)
+        destroy_ir_arena(get_module_arena(old_mod));
+    old_mod = *pmod;
+    if (config->optimisations.cleanup.after_every_pass)
+        *pmod = cleanup(config, *pmod);
+    debugvv_print("After pass %s: \n", pass_name);
+    log_module(DEBUGVV, config, *pmod);
+    if (SHADY_RUN_VERIFY)
+        verify_module(config, *pmod);
+    if (get_module_arena(old_mod) != get_module_arena(*pmod) && get_module_arena(old_mod) != initial_arena)
+        destroy_ir_arena(get_module_arena(old_mod));
+    if (config->hooks.after_pass.fn)
+        config->hooks.after_pass.fn(config->hooks.after_pass.uptr, pass_name, *pmod);
+}
+
 CompilationResult run_compiler_passes(CompilerConfig* config, Module** pmod) {
     IrArena* initial_arena = (*pmod)->arena;
-    Module* old_mod = NULL;
 
     if (config->dynamic_scheduling) {
 		*pmod = import(config, *pmod); // we don't want to mess with the original module

src/shady/compile.h

@@ -12,25 +12,8 @@
 #define SHADY_RUN_VERIFY 1
 #endif
 
-#define RUN_PASS(pass_name) {                           \
-old_mod = *pmod;                                        \
-*pmod = pass_name(config, *pmod);                       \
-(*pmod)->sealed = true;                                 \
-if (SHADY_RUN_VERIFY)                                   \
-  verify_module(config, *pmod);                         \
-if (get_module_arena(old_mod) != get_module_arena(*pmod) && get_module_arena(old_mod) != initial_arena) \
-  destroy_ir_arena(get_module_arena(old_mod));          \
-old_mod = *pmod;                                        \
-if (config->optimisations.cleanup.after_every_pass)     \
-  *pmod = cleanup(config, *pmod);                       \
-debugvv_print("After "#pass_name" pass: \n");           \
-log_module(DEBUGVV, config, *pmod);                     \
-if (SHADY_RUN_VERIFY)                                   \
-  verify_module(config, *pmod);                         \
-if (get_module_arena(old_mod) != get_module_arena(*pmod) && get_module_arena(old_mod) != initial_arena) \
-  destroy_ir_arena(get_module_arena(old_mod));          \
-if (config->hooks.after_pass.fn)                        \
-  config->hooks.after_pass.fn(config->hooks.after_pass.uptr, #pass_name, *pmod);                        \
-} \
+void run_pass_impl(CompilerConfig* config, Module** pmod, IrArena* initial_arena, RewritePass pass, String pass_name);
+
+#define RUN_PASS(pass_name) run_pass_impl(config, pmod, initial_arena, pass_name, #pass_name);
 
 #endif

src/shady/emit/c/emit_c.c

@@ -688,7 +688,6 @@ bool compare_node(Node**, Node**);
 
 static Module* run_backend_specific_passes(CompilerConfig* config, CEmitterConfig* econfig, Module* initial_mod) {
     IrArena* initial_arena = initial_mod->arena;
-    Module* old_mod = NULL;
     Module** pmod = &initial_mod;
 
     // C lacks a nice way to express constants that can be used in type definitions afterwards, so let's just inline them all.

src/shady/emit/spirv/emit_spv.c

@@ -520,7 +520,6 @@ bool compare_string(const char** a, const char** b);
 
 static Module* run_backend_specific_passes(CompilerConfig* config, Module* initial_mod) {
     IrArena* initial_arena = initial_mod->arena;
-    Module* old_mod = NULL;
     Module** pmod = &initial_mod;
 
     RUN_PASS(lower_entrypoint_args)