Really fixed arrays of dynarrays this time.

ZDoom · Jun 7, 2019 · 4161ef7 · 4161ef7
1 parent 08cda06
commit 4161ef7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/scripting/backend/codegen.cpp b/src/scripting/backend/codegen.cpp
@@ -7424,7 +7424,6 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
 	{
 		bool ismeta = Array->ExprType == EFX_ClassMember && static_cast<FxClassMember*>(Array)->membervar->Flags & VARF_Meta;
 
-		arrayvar.Free(build);
 		start = ExpEmit(build, REGT_POINTER);
 		build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0));
 
@@ -7444,18 +7443,18 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
 		arraymemberbase->membervar = origmembervar;
 		arraymemberbase->AddressRequested = origaddrreq;
 		Array->ValueType = origvaluetype;
+
+		arrayvar.Free(build);
 	}
 	else if (Array->ExprType == EFX_ArrayElement && Array->isStaticArray())
 	{
-		bool ismeta = Array->ExprType == EFX_ClassMember && static_cast<FxClassMember*>(Array)->membervar->Flags & VARF_Meta;
+		bound = ExpEmit(build, REGT_INT);
+		build->Emit(OP_LW, bound.RegNum, arrayvar.RegNum, build->GetConstantInt(myoffsetof(FArray, Count)));
 
 		arrayvar.Free(build);
 		start = ExpEmit(build, REGT_POINTER);
 		build->Emit(OP_LP, start.RegNum, arrayvar.RegNum, build->GetConstantInt(0));
 
-		bound = ExpEmit(build, REGT_INT);
-		build->Emit(OP_LW, bound.RegNum, arrayvar.RegNum, build->GetConstantInt(sizeof(void*)));
-
 		nestedarray = true;
 	}
 	else start = arrayvar;
@@ -7513,7 +7512,7 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build)
 	else
 	{
 		ExpEmit indexv(index->Emit(build));
-		if (SizeAddr != ~0u)
+		if (SizeAddr != ~0u || nestedarray)
 		{
 			build->Emit(OP_BOUND_R, indexv.RegNum, bound.RegNum);
 			bound.Free(build);