Coalesce condition blocks so GCC *5* can understand.

brixen · brixen · commit 628fe1c2cfce · 2016-04-15T11:20:44.000-07:00
diff --git a/machine/instructions.def b/machine/instructions.def
@@ -1943,12 +1943,6 @@ instruction zsuper(literal) [ block -- value ]
     }
   }
 
-  native_int keywords_position, placeholder_position;
-  if(mc->keywords) {
-    placeholder_position = splat_obj ? mc->total_args : mc->total_args - 1;
-    keywords_position = placeholder_position + 1;
-  }
-
   Tuple* tup = Tuple::create(state, arg_count);
   for(int i = 0; i < mc->total_args; i++) {
     tup->put(state, i, scope->get_local(state, i));
@@ -1963,6 +1957,9 @@ instruction zsuper(literal) [ block -- value ]
   }
 
   if(mc->keywords) {
+    native_int placeholder_position = splat_obj ? mc->total_args : mc->total_args - 1;
+    native_int keywords_position = placeholder_position + 1;
+
     Object* placeholder = scope->get_local(state, placeholder_position);
     Array* ary = Array::create(state, 2);
 

Original file line number	Diff line number	Diff line change
`@@ -1943,12 +1943,6 @@ instruction zsuper(literal) [ block -- value ]`
`1943`	`1943`	`}`
`1944`	`1944`	`}`
`1945`	`1945`
`1946`		`- native_int keywords_position, placeholder_position;`
`1947`		`- if(mc->keywords) {`
`1948`		`- placeholder_position = splat_obj ? mc->total_args : mc->total_args - 1;`
`1949`		`- keywords_position = placeholder_position + 1;`
`1950`		`- }`
`1951`		`-`
`1952`	`1946`	`Tuple* tup = Tuple::create(state, arg_count);`
`1953`	`1947`	`for(int i = 0; i < mc->total_args; i++) {`
`1954`	`1948`	`tup->put(state, i, scope->get_local(state, i));`
`@@ -1963,6 +1957,9 @@ instruction zsuper(literal) [ block -- value ]`
`1963`	`1957`	`}`
`1964`	`1958`
`1965`	`1959`	`if(mc->keywords) {`
	`1960`	`+ native_int placeholder_position = splat_obj ? mc->total_args : mc->total_args - 1;`
	`1961`	`+ native_int keywords_position = placeholder_position + 1;`
	`1962`	`+`
`1966`	`1963`	`Object* placeholder = scope->get_local(state, placeholder_position);`
`1967`	`1964`	`Array* ary = Array::create(state, 2);`
`1968`	`1965`