Work on making sum-types able to hold ref-to-structure types

Author: apoch

EpochDevTools32/Compiler/LLVM.epoch

@@ -422,7 +422,7 @@ GetLLVMTypeForEpochType : LLVMContextHandle context, integer typeid -> LLVMType
 		boolean found = BinaryTreeCopyPayload<LLVMType>(LLVMSumTypeTable.RootNode, typeid, t)
 		if(!found)
 		{
-			t = EpochLLVMSumTypeCreate(context, GetPooledString(GetNameOfType(typeid)), 8)			// TODO - fix sum typed objects to packed storage
+			t = EpochLLVMSumTypeCreate(context, GetPooledString(GetNameOfType(typeid)), GetTypeSize(typeid))			// TODO - fix sum typed objects to packed storage
 			BinaryTreeCreateOrInsert<LLVMType>(LLVMSumTypeTable, typeid, t)
 		}
 	}
@@ -1005,9 +1005,12 @@ EmitSingleCodeBlockEntryToLLVM : LLVMBuildContext ref context, Statement ref ent
 		if (IsReferenceType(rhstype))
 		{
 			EmitPartialExpressionListToLLVM(context, entry.Parameters)
-			EpochLLVMCodeCreateDereference(context.Context)
+
+			// TODO - HACK - this should only dereference if the LHS is not reftype
+			//EpochLLVMCodeCreateDereference(context.Context)
+
 			EpochLLVMCodePushRawAlloca(context.Context, stalloca)
-			EpochLLVMCodePushInteger(context.Context, MakeNonReferenceType(rhstype))
+			EpochLLVMCodePushInteger(context.Context, rhstype)
 			EpochLLVMCodeCreateWriteStructurePopSumType(context.Context)
 		}
 		else
@@ -2443,7 +2446,7 @@ EmitTypeMatcherParamsInLLVM : LLVMContextHandle context, list<FunctionSignature>
 		else
 		{
 			boolean refflag = IsReferenceType(params.value.Type)	
-			integer paramtype = MakeNonReferenceType(params.value.Type)
+			integer paramtype = params.value.Type					// TODO - HACK - was makenonreftype but that breaks reftypes inside sum types
 			while((paramtype & 0x7f000000) == 0x05000000)
 			{
 				paramtype = FindTypeAliasBase(paramtype)
@@ -2457,7 +2460,7 @@ EmitTypeMatcherParamsInLLVM : LLVMContextHandle context, list<FunctionSignature>
 				{
 					EpochLLVMCodeCreateReadParam(context, paramindex)
 					EpochLLVMCodePushExtractedStructValue(context, 0)
-					EpochLLVMCodePushInteger(context, MakeNonReferenceType(paramtype))
+					EpochLLVMCodePushInteger(context, paramtype)
 					EpochLLVMCodeOperatorIntegerEquals(context)
 					EpochLLVMCodeCreateCondBranch(context, EpochLLVMCodePopValue(context), nextparamblock, nextoverloadblock)
 					++relevantparams

EpochDevTools32/Compiler/Structures.epoch

@@ -488,3 +488,29 @@ ExtractAllMemberTypes : list<StructureMember> ref members, list<ParameterTypeLis
 }
 
 ExtractAllMemberTypes : nothing, nothing
+
+
+ComputeStructureSize : integer typeid -> integer size = 0
+{
+	integer structurename = GetNameOfType(typeid)
+	
+	ContextNode<StructureDefinition> wrap = nothing
+	boolean found = SearchBinaryTreeForPayload<StructureDefinition>(GlobalRootNamespace.Structures.RootNode, structurename, wrap)
+	assert(found)
+
+	ComputeStructureMemberSizes(wrap, size)
+}
+
+ComputeStructureMemberSizes : StructureDefinition ref structuredef, integer ref size
+{
+	ComputeStructureMemberSizes(structuredef.Members, size)
+}
+
+ComputeStructureMemberSizes : list<StructureMember> ref members, integer ref size
+{
+	size = size + GetTypeSize(GetMemberTypeDecompose(members.value))
+	ComputeStructureMemberSizes(members.next, size)
+}
+
+ComputeStructureMemberSizes : nothing, integer ref size
+

EpochDevTools32/Compiler/SumTypes.epoch

@@ -193,6 +193,12 @@ ResolveSumTypeBases : list<SumTypeBase> ref bases -> boolean success = true
 			success = false
 		}
 
+		// TODO - HACK - this forces all structures in sum types to be indirected!
+		if(IsStructureType(resolvedtype))
+		{
+			resolvedtype = MakeReferenceType(resolvedtype)
+		}
+
 		bases.value.Name = resolvedtype
 	}
 

EpochDevTools32/Compiler/TypeInfo.epoch

@@ -33,11 +33,25 @@ GetTypeSize : integer typeid -> integer size = 0
 	}
 	elseif(IsStructureType(typeid))			// StructureHandle
 	{
-		size = 8
+		if(IsReferenceType(typeid))
+		{
+			size = 8
+		}
+		else
+		{
+			size = ComputeStructureSize(typeid)
+		}
 	}
 	elseif((typeid & 0xff000000) == 0x07000000)	// SumType
 	{
-		size = 4 + 8
+		if(IsReferenceType(typeid))
+		{
+			size = 8
+		}
+		else
+		{
+			size = 4 + GetLargestSumTypeBaseSize(typeid)
+		}
 	}
 	elseif(typeid == 0x00000004)			// Nothing
 	{