[cleanup] Refactor GenC.VisitReturn.

Author: pfusik

GenC.fu

@@ -2875,24 +2875,24 @@ public class GenC : GenCCpp
 				WriteDestructAll();
 				base.VisitReturn(statement);
 			}
-			else {
-				if (statement.Value is FuSymbolReference symbol && symbol.Symbol is FuVar local) {
-					if (this.VarsToDestruct.Contains(local)) {
-						// Optimization: avoid copy
-						WriteDestructAll(local);
-						Write("return ");
-						if (this.CurrentMethod.Type is FuClassType resultPtr && !(resultPtr is FuStorageType))
-							WriteClassPtr(resultPtr.Class, symbol, FuPriority.Argument); // upcast, but don't AddRef
-						else
-							symbol.Accept(this, FuPriority.Argument);
-						WriteCharLine(';');
-						return;
-					}
+			else if (statement.Value is FuSymbolReference symbol && symbol.Symbol is FuVar local) {
+				if (this.VarsToDestruct.Contains(local)) {
+					// Optimization: avoid copy
+					WriteDestructAll(local);
+					Write("return ");
+					if (this.CurrentMethod.Type is FuClassType resultPtr && !(resultPtr is FuStorageType))
+						WriteClassPtr(resultPtr.Class, symbol, FuPriority.Argument); // upcast, but don't AddRef
+					else
+						symbol.Accept(this, FuPriority.Argument);
+					WriteCharLine(';');
+				}
+				else {
 					// Local variable value doesn't depend on destructed variables
 					WriteDestructAll();
 					base.VisitReturn(statement);
-					return;
 				}
+			}
+			else {
 				WriteTemporaries(statement.Value);
 				EnsureChildBlock();
 				StartDefinition(this.CurrentMethod.Type, true, true);

libfut.cpp

@@ -11837,26 +11837,28 @@ void GenC::visitReturn(const FuReturn * statement)
 					else
 						symbol->accept(this, FuPriority::argument);
 					writeCharLine(';');
-					return;
 				}
-				writeDestructAll();
-				GenCCpp::visitReturn(statement);
-				return;
+				else {
+					writeDestructAll();
+					GenCCpp::visitReturn(statement);
+				}
 			}
-			writeTemporaries(statement->value.get());
-			ensureChildBlock();
-			startDefinition(this->currentMethod->type.get(), true, true);
-			write("returnValue = ");
-			writeCoerced(this->currentMethod->type.get(), statement->value.get(), FuPriority::argument);
-			writeCharLine(';');
-			cleanupTemporaries();
-			writeDestructAll();
-			if (throwingMethod != nullptr) {
-				startForwardThrow(throwingMethod);
-				write("returnValue");
-				endForwardThrow(throwingMethod);
+			else {
+				writeTemporaries(statement->value.get());
+				ensureChildBlock();
+				startDefinition(this->currentMethod->type.get(), true, true);
+				write("returnValue = ");
+				writeCoerced(this->currentMethod->type.get(), statement->value.get(), FuPriority::argument);
+				writeCharLine(';');
+				cleanupTemporaries();
+				writeDestructAll();
+				if (throwingMethod != nullptr) {
+					startForwardThrow(throwingMethod);
+					write("returnValue");
+					endForwardThrow(throwingMethod);
+				}
+				writeLine("return returnValue;");
 			}
-			writeLine("return returnValue;");
 		}
 	}
 }

libfut.cs

@@ -12090,22 +12090,22 @@ internal override void VisitReturn(FuReturn statement)
 					WriteDestructAll();
 					base.VisitReturn(statement);
 				}
-				else {
-					if (statement.Value is FuSymbolReference symbol && symbol.Symbol is FuVar local) {
-						if (this.VarsToDestruct.Contains(local)) {
-							WriteDestructAll(local);
-							Write("return ");
-							if (this.CurrentMethod.Type is FuClassType resultPtr && !(resultPtr is FuStorageType))
-								WriteClassPtr(resultPtr.Class, symbol, FuPriority.Argument);
-							else
-								symbol.Accept(this, FuPriority.Argument);
-							WriteCharLine(';');
-							return;
-						}
+				else if (statement.Value is FuSymbolReference symbol && symbol.Symbol is FuVar local) {
+					if (this.VarsToDestruct.Contains(local)) {
+						WriteDestructAll(local);
+						Write("return ");
+						if (this.CurrentMethod.Type is FuClassType resultPtr && !(resultPtr is FuStorageType))
+							WriteClassPtr(resultPtr.Class, symbol, FuPriority.Argument);
+						else
+							symbol.Accept(this, FuPriority.Argument);
+						WriteCharLine(';');
+					}
+					else {
 						WriteDestructAll();
 						base.VisitReturn(statement);
-						return;
 					}
+				}
+				else {
 					WriteTemporaries(statement.Value);
 					EnsureChildBlock();
 					StartDefinition(this.CurrentMethod.Type, true, true);

libfut.js

@@ -12495,26 +12495,28 @@ export class GenC extends GenCCpp
 						else
 							symbol.accept(this, FuPriority.ARGUMENT);
 						this.writeCharLine(59);
-						return;
 					}
-					this.#writeDestructAll();
-					super.visitReturn(statement);
-					return;
+					else {
+						this.#writeDestructAll();
+						super.visitReturn(statement);
+					}
 				}
-				this.writeTemporaries(statement.value);
-				this.ensureChildBlock();
-				this.#startDefinition(this.currentMethod.type, true, true);
-				this.write("returnValue = ");
-				this.writeCoerced(this.currentMethod.type, statement.value, FuPriority.ARGUMENT);
-				this.writeCharLine(59);
-				this.cleanupTemporaries();
-				this.#writeDestructAll();
-				if (throwingMethod != null) {
-					this.#startForwardThrow(throwingMethod);
-					this.write("returnValue");
-					this.#endForwardThrow(throwingMethod);
+				else {
+					this.writeTemporaries(statement.value);
+					this.ensureChildBlock();
+					this.#startDefinition(this.currentMethod.type, true, true);
+					this.write("returnValue = ");
+					this.writeCoerced(this.currentMethod.type, statement.value, FuPriority.ARGUMENT);
+					this.writeCharLine(59);
+					this.cleanupTemporaries();
+					this.#writeDestructAll();
+					if (throwingMethod != null) {
+						this.#startForwardThrow(throwingMethod);
+						this.write("returnValue");
+						this.#endForwardThrow(throwingMethod);
+					}
+					this.writeLine("return returnValue;");
 				}
-				this.writeLine("return returnValue;");
 			}
 		}
 	}