remove some unnecessary update_a and pop_a instructions when creating an ARRAY node

backendC/CleanCompilerSources/codegen.c

@@ -930,16 +930,17 @@ static void CodeRule (ImpRuleP rule)
 					case TupleState:
 						BuildTuple (asize, bsize, asize, bsize, function_state_p[-1].state_arity,
 							function_state_p[-1].state_tuple_arguments,asize,bsize, asize,NormalFill,True);
+						GenUpdatePopA (0, asize);
 						break;
 					case RecordState:
 						BuildRecord (function_state_p[-1].state_record_symbol,asize, bsize, asize, bsize,
 								asize, bsize, asize, NormalFill,True);
+						GenUpdatePopA (0, asize);
 						break;
 					case ArrayState:
-						GenBuildArray (0);
+						GenBuildArrayPop();
 						break;
 				}
-				GenUpdatePopA (0, asize);
 			}
 	
 			GenPopB		(bsize);

backendC/CleanCompilerSources/codegen1.c

@@ -1878,21 +1878,17 @@ void ApplyEntry (StateS *const function_state_p,int arity,Label ea_lab,int ea_la
 			case TupleState:
 				BuildTuple (asize, bsize, asize, bsize, function_state_p[-1].state_arity,
 					function_state_p[-1].state_tuple_arguments,asize,bsize, asize,NormalFill,True);
+				GenUpdatePopA (0, asize);
 				break;
 			case RecordState:
 				BuildRecord (function_state_p[-1].state_record_symbol,asize, bsize, asize, bsize,
 							asize, bsize, asize, NormalFill,True);
+				GenUpdatePopA (0, asize);
 				break;
 			case ArrayState:
-				GenBuildArray (0);
+				GenBuildArrayPop();
 				break;
 		}
-#if UPDATE_POP
-		GenUpdatePopA (0, asize);
-#else
-		GenUpdateA	(0, asize);
-		GenPopA		(asize);
-#endif
 		GenPopB		(bsize);
 		GenRtn		(1,0,OnAState);
 #if SHARE_UPDATE_CODE

backendC/CleanCompilerSources/codegen2.c

@@ -687,19 +687,27 @@ void CoerceArgumentOnTopOfStack (int *asp_p,int *bsp_p,StateS argstate,StateS no
 				BuildTuple (*asp_p,*bsp_p,*asp_p,*bsp_p,nodestate.state_arity,nodestate.state_tuple_arguments,
 							asize,bsize,*asp_p,NormalFill,True);
 				*asp_p+=1;
+				GenUpdatePopA (0,asize);
+				*asp_p-=asize;
 				break;
 			case RecordState:
 				BuildRecord (nodestate.state_record_symbol,*asp_p,*bsp_p,*asp_p,*bsp_p,
 							asize,bsize,*asp_p,NormalFill,True);
 				*asp_p+=1;
+				GenUpdatePopA (0,asize);
+				*asp_p-=asize;
 				break;
 			case ArrayState:
+				if (asize==1)
+					GenBuildArrayPop();
+				else {
 					GenBuildArray (0);
 					++*asp_p;
-				break;
-		}
 					GenUpdatePopA (0,asize);
 					*asp_p-=asize;
+				}
+				break;
+		}
 		GenPopB (bsize);
 		*bsp_p-=bsize;
 	} else {
@@ -3845,9 +3853,8 @@ static void FillUpdateNode (Node node,int *asp_p,int *bsp_p,NodeId update_node_i
 		}
 
 		if (update_immediately){
-#if 1
 			BuildArgs (record_arg->arg_next,asp_p,bsp_p,code_gen_node_ids_p);
-#endif
+
 			if (record_node->node_kind==NodeIdNode){
 				NodeIdP record_node_id;
 				
@@ -3860,9 +3867,6 @@ static void FillUpdateNode (Node node,int *asp_p,int *bsp_p,NodeId update_node_i
 
 #if BOXED_RECORDS
 					record_node_id->nid_mark2 |= NID_RECORD_USED_BY_NON_SELECTOR_OR_UPDATES;
-#endif
-#if 0
-					BuildArgs (record_arg->arg_next,asp_p,bsp_p,code_gen_node_ids_p);
 #endif
 					DetermineSizeOfState (*record_state_p,&record_a_size,&record_b_size);
 				
@@ -3896,11 +3900,9 @@ static void FillUpdateNode (Node node,int *asp_p,int *bsp_p,NodeId update_node_i
 #endif
 
 			record_arg->arg_state=*record_state_p;
-#if 1
+
 			BuildArg (node->node_arguments,asp_p,bsp_p,code_gen_node_ids_p);
-#else
-			BuildArgs (node->node_arguments,asp_p,bsp_p,code_gen_node_ids_p);
-#endif
+
 			DetermineSizeOfState (*record_state_p,&record_a_size,&record_b_size);
 
 			{

backendC/CleanCompilerSources/codegen3.c

@@ -255,15 +255,21 @@ void RedirectResultAndReturn (int asp,int bsp,int source_a_index,int source_b_in
 					BuildTuple (source_a_index,source_b_index,asp,bsp,
 						offstate.state_arity, offstate.state_tuple_arguments,
 						offasize, offbsize, 0, ReleaseAndFill,True);
+					GenUpdatePopA (0,asp);
 					break;
 				case RecordState:
 					BuildRecord (offstate.state_record_symbol,source_a_index,source_b_index, asp, bsp,
 						offasize, offbsize, 0, ReleaseAndFill,True);
+					GenUpdatePopA (0,asp);
 					break;
 				case ArrayState:
+					if (asp==source_a_index && asp==1)
+						GenBuildArrayPop();
+					else {
 						GenBuildArray (asp-source_a_index);
-			}
 						GenUpdatePopA (0,asp);
+					}
+			}
 			GenPopB (bsp);
 		} else {
 			switch (offstate.state_type){

backendC/CleanCompilerSources/instructions.c

@@ -2168,10 +2168,15 @@ void GenBuildU (Label symblab,int a_size,int b_size,Label contlab)
 	GenDescriptorOrNodeEntryLabel (contlab);
 }
 
+void GenBuildArrayPop (void)
+{
+	GenBuildh (& BasicDescriptors [ArrayObj], 1);
+}
+
 void GenBuildArray (int argoffset)
 {
 	GenPushA (argoffset);
-	GenBuildh (& BasicDescriptors [ArrayObj], 1);
+	GenBuildArrayPop();
 }
 
 void GenBuildString (SymbValue val)

backendC/CleanCompilerSources/instructions.h

@@ -64,6 +64,7 @@ void GenBuild (Label symblab,int arity,Label contlab);
 void GenBuildh (Label symblab,int arity);
 void GenBuildPartialFunctionh (Label symblab,int arity);
 void GenBuildU (Label symblab,int a_size,int b_size,Label contlab);
+void GenBuildArrayPop (void);
 void GenBuildArray (int argoffset);
 void GenBuildString (SymbValue val);