[c] Destruct temporary object storage.

fusionlanguage#26

Author: pfusik

GenC.fu

@@ -858,6 +858,14 @@ public class GenC : GenCCpp
 		}
 	}
 
+	void StartDestructCall!(FuClassType klass)
+	{
+		bool addressOf = WriteDestructMethodName(klass);
+		WriteChar('(');
+		if (addressOf)
+			WriteChar('&');
+	}
+
 	static bool HasDictionaryDestroy(FuType? type) => type is FuOwningType || type is FuStringStorageType;
 
 	void WriteDictionaryDestroy!(FuType? type)
@@ -1151,9 +1159,8 @@ public class GenC : GenCCpp
 		if (!NeedToDestructType(temp.Type)
 		 || (temp is FuPrefixExpr dynamicObjectLiteral && dynamicObjectLiteral.Inner is FuAggregateInitializer)) // FIXME: if temporary, still needs to be destructed
 			return;
-		WriteDestructMethodName(temp.Type.AsClassType());
-		Write("(futemp");
-		VisitLiteralLong(i);
+		StartDestructCall(temp.Type.AsClassType());
+		WriteTemporaryName(i);
 		WriteLine(");");
 	}
 
@@ -1368,10 +1375,7 @@ public class GenC : GenCCpp
 			type = array.GetElementType();
 		}
 		assert type is FuClassType klass;
-		bool addressOf = WriteDestructMethodName(klass);
-		WriteChar('(');
-		if (addressOf)
-			WriteChar('&');
+		StartDestructCall(klass);
 		WriteLocalName(symbol, FuPriority.Primary);
 		for (int i = 0; i < nesting; i++) {
 			Write("[_i");

libfut.cpp

@@ -9772,6 +9772,14 @@ bool GenC::writeDestructMethodName(const FuClassType * klass)
 	}
 }
 
+void GenC::startDestructCall(const FuClassType * klass)
+{
+	bool addressOf = writeDestructMethodName(klass);
+	writeChar('(');
+	if (addressOf)
+		writeChar('&');
+}
+
 bool GenC::hasDictionaryDestroy(const FuType * type)
 {
 	return dynamic_cast<const FuOwningType *>(type) || dynamic_cast<const FuStringStorageType *>(type);
@@ -10054,9 +10062,8 @@ void GenC::cleanupTemporary(int i, const FuExpr * temp)
 	const FuPrefixExpr * dynamicObjectLiteral;
 	if (!needToDestructType(temp->type.get()) || ((dynamicObjectLiteral = dynamic_cast<const FuPrefixExpr *>(temp)) && dynamic_cast<const FuAggregateInitializer *>(dynamicObjectLiteral->inner.get())))
 		return;
-	writeDestructMethodName(temp->type->asClassType());
-	write("(futemp");
-	visitLiteralLong(i);
+	startDestructCall(temp->type->asClassType());
+	writeTemporaryName(i);
 	writeLine(");");
 }
 
@@ -10259,10 +10266,7 @@ void GenC::writeDestruct(const FuSymbol * symbol)
 		type = array->getElementType().get();
 	}
 	const FuClassType * klass = static_cast<const FuClassType *>(type);
-	bool addressOf = writeDestructMethodName(klass);
-	writeChar('(');
-	if (addressOf)
-		writeChar('&');
+	startDestructCall(klass);
 	writeLocalName(symbol, FuPriority::primary);
 	for (int i = 0; i < nesting; i++) {
 		write("[_i");

libfut.cs

@@ -10073,6 +10073,14 @@ bool WriteDestructMethodName(FuClassType klass)
 			}
 		}
 
+		void StartDestructCall(FuClassType klass)
+		{
+			bool addressOf = WriteDestructMethodName(klass);
+			WriteChar('(');
+			if (addressOf)
+				WriteChar('&');
+		}
+
 		static bool HasDictionaryDestroy(FuType type) => type is FuOwningType || type is FuStringStorageType;
 
 		void WriteDictionaryDestroy(FuType type)
@@ -10363,9 +10371,8 @@ protected override void CleanupTemporary(int i, FuExpr temp)
 		{
 			if (!NeedToDestructType(temp.Type) || (temp is FuPrefixExpr dynamicObjectLiteral && dynamicObjectLiteral.Inner is FuAggregateInitializer))
 				return;
-			WriteDestructMethodName(temp.Type.AsClassType());
-			Write("(futemp");
-			VisitLiteralLong(i);
+			StartDestructCall(temp.Type.AsClassType());
+			WriteTemporaryName(i);
 			WriteLine(");");
 		}
 
@@ -10567,10 +10574,7 @@ void WriteDestruct(FuSymbol symbol)
 				type = array.GetElementType();
 			}
 			FuClassType klass = (FuClassType) type;
-			bool addressOf = WriteDestructMethodName(klass);
-			WriteChar('(');
-			if (addressOf)
-				WriteChar('&');
+			StartDestructCall(klass);
 			WriteLocalName(symbol, FuPriority.Primary);
 			for (int i = 0; i < nesting; i++) {
 				Write("[_i");

libfut.hpp

@@ -2163,6 +2163,7 @@ class GenC : public GenCCpp
 	static const FuExpr * getStringSubstringLength(const FuCallExpr * call);
 	void writeStringStorageValue(const FuExpr * expr);
 	bool writeDestructMethodName(const FuClassType * klass);
+	void startDestructCall(const FuClassType * klass);
 	static bool hasDictionaryDestroy(const FuType * type);
 	void writeDictionaryDestroy(const FuType * type);
 	void writeHashEqual(const FuType * keyType);

libfut.js

@@ -10416,6 +10416,14 @@ export class GenC extends GenCCpp
 		}
 	}
 
+	#startDestructCall(klass)
+	{
+		let addressOf = this.#writeDestructMethodName(klass);
+		this.writeChar(40);
+		if (addressOf)
+			this.writeChar(38);
+	}
+
 	static #hasDictionaryDestroy(type)
 	{
 		return type instanceof FuOwningType || type instanceof FuStringStorageType;
@@ -10724,9 +10732,8 @@ export class GenC extends GenCCpp
 		let dynamicObjectLiteral;
 		if (!GenC.#needToDestructType(temp.type) || ((dynamicObjectLiteral = temp) instanceof FuPrefixExpr && dynamicObjectLiteral.inner instanceof FuAggregateInitializer))
 			return;
-		this.#writeDestructMethodName(temp.type.asClassType());
-		this.write("(futemp");
-		this.visitLiteralLong(BigInt(i));
+		this.#startDestructCall(temp.type.asClassType());
+		this.writeTemporaryName(i);
 		this.writeLine(");");
 	}
 
@@ -10934,10 +10941,7 @@ export class GenC extends GenCCpp
 			type = array.getElementType();
 		}
 		let klass = type;
-		let addressOf = this.#writeDestructMethodName(klass);
-		this.writeChar(40);
-		if (addressOf)
-			this.writeChar(38);
+		this.#startDestructCall(klass);
 		this.writeLocalName(symbol, FuPriority.PRIMARY);
 		for (let i = 0; i < nesting; i++) {
 			this.write("[_i");

test/MethodArgTempObjectStgDestructor.fu

@@ -0,0 +1,24 @@
+class Data
+{
+	internal string() S; //FAIL: cl
+}
+
+public static class Test
+{
+	static Data() ReturnStorage()
+	{
+		Data() o;
+		o.S = "foo";
+		return o; //FAIL: c TODO
+	}
+
+	static string AcceptPtr(Data d)
+	{
+		return d.S;
+	}
+
+	public static bool Run()
+	{
+		return AcceptPtr(ReturnStorage()) == "foo";
+	}
+}