- added an optimization to FxBoolCast that it doesn't force the source value to a 0/1 integer if not explicitly needed. When doing comparisons we do not care about actual values, we only want to know if it is 0 or not.

- added the above for the 'if' condition. It works for integers, floats and pointers and will save 3 instructions if the condition is a non-boolean that can be implicitly casted to bool.

src/scripting/codegeneration/codegen.cpp

@@ -434,11 +434,12 @@ ExpEmit FxConstant::Emit(VMFunctionBuilder *build)
 //
 //==========================================================================
 
-FxBoolCast::FxBoolCast(FxExpression *x)
+FxBoolCast::FxBoolCast(FxExpression *x, bool needvalue)
 	: FxExpression(EFX_BoolCast, x->ScriptPosition)
 {
 	basex = x;
 	ValueType = TypeBool;
+	NeedValue = needvalue;
 }
 
 //==========================================================================
@@ -499,9 +500,11 @@ ExpEmit FxBoolCast::Emit(VMFunctionBuilder *build)
 	ExpEmit from = basex->Emit(build);
 	assert(!from.Konst);
 	assert(basex->ValueType->GetRegType() == REGT_INT || basex->ValueType->GetRegType() == REGT_FLOAT || basex->ValueType->GetRegType() == REGT_POINTER);
+
+	if (NeedValue)
+	{
 		ExpEmit to(build, REGT_INT);
 		from.Free(build);
-
 		// Preload result with 0.
 		build->Emit(OP_LI, to.RegNum, 0);
 
@@ -522,8 +525,12 @@ ExpEmit FxBoolCast::Emit(VMFunctionBuilder *build)
 
 		// Reload result with 1 if the comparison fell through.
 		build->Emit(OP_LI, to.RegNum, 1);
-
 		return to;
+	}
+	else
+	{
+		return from;
+	}
 }
 
 //==========================================================================
@@ -5871,7 +5878,7 @@ FxExpression *FxIfStatement::Resolve(FCompileContext &ctx)
 
 	if (Condition->ValueType != TypeBool)
 	{
-		Condition = new FxBoolCast(Condition);
+		Condition = new FxBoolCast(Condition, false);
 		SAFE_RESOLVE(Condition, ctx);
 	}
 
@@ -5914,7 +5921,7 @@ ExpEmit FxIfStatement::Emit(VMFunctionBuilder *build)
 	// This is pretty much copied from FxConditional, except we don't
 	// keep any results.
 	ExpEmit cond = Condition->Emit(build);
-	assert(cond.RegType == REGT_INT && !cond.Konst);
+	assert(cond.RegType != REGT_STRING && !cond.Konst);
 
 	if (WhenTrue != NULL)
 	{
@@ -5933,7 +5940,22 @@ ExpEmit FxIfStatement::Emit(VMFunctionBuilder *build)
 	}
 
 	// Test condition.
+
+	switch (cond.RegType)
+	{
+	default:
+	case REGT_INT:
 		build->Emit(OP_EQ_K, condcheck, cond.RegNum, build->GetConstantInt(0));
+		break;
+
+	case REGT_FLOAT:
+		build->Emit(OP_EQF_K, condcheck, cond.RegNum, build->GetConstantFloat(0));
+		break;
+
+	case REGT_POINTER:
+		build->Emit(OP_EQA_K, condcheck, cond.RegNum, build->GetConstantAddress(nullptr, ATAG_GENERIC));
+		break;
+	}
 	jumpspot = build->Emit(OP_JMP, 0);
 	cond.Free(build);
 

src/scripting/codegeneration/codegen.h

@@ -457,10 +457,11 @@ public:
 class FxBoolCast : public FxExpression
 {
 	FxExpression *basex;
+	bool NeedValue;
 
 public:
 
-	FxBoolCast(FxExpression *x);
+	FxBoolCast(FxExpression *x, bool needvalue = true);
 	~FxBoolCast();
 	FxExpression *Resolve(FCompileContext&);