Fix single captured detection, and when r0 is also alias of local var

vshaxe · Jun 18, 2024 · 04ea282 · 04ea282
1 parent ece6460
commit 04ea282
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hld/CodeGraph.hx b/hld/CodeGraph.hx
@@ -83,7 +83,7 @@ class CodeGraph {
 			}
 			var r = -a.position - 2;
 			var vars;
-			if( r != reg ) {
+			if( r != reg && a.position != -1) {
 				reg = r;
 				vars = [];
 				args.unshift({ hasIndex : true, vars : vars });
@@ -94,7 +94,7 @@ class CodeGraph {
 		}
 
 		// single captured pointer => passed directly
-		if( args.length >= 1 && args[0].hasIndex && args[0].vars.length == 1 && !f.regs[0].match(HEnum({name:""})) )
+		if( args.length >= 1 && args[0].hasIndex && !f.regs[0].match(HEnum({name:null})) )
 			args[0].hasIndex = false;
 
 		if( args.length == nargs - 1 )