From 1abdd1476e237001228af7d703954ee20067a36e Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:20:55 +0100 Subject: [PATCH] Fix error message when propagating invalid function parameter to const --- oscar64/GlobalOptimizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar64/GlobalOptimizer.cpp b/oscar64/GlobalOptimizer.cpp index 0dbeeee..c420b1f 100644 --- a/oscar64/GlobalOptimizer.cpp +++ b/oscar64/GlobalOptimizer.cpp @@ -759,7 +759,7 @@ Declaration* GlobalOptimizer::Analyze(Expression* exp, Declaration* procDec, uin } if (!(pdec->mFlags & DTF_FPARAM_UNUSED) && !(pdec->mOptFlags & OPTF_VAR_NOCONST)) { - if (pex->mType == EX_CONSTANT && pdec->mBase->IsSimpleType()) + if (pex->mType == EX_CONSTANT && pdec->mBase->IsSimpleType() && pdec->mBase->CanAssign(pex->mDecType)) { if (pdec->mOptFlags & OPTF_VAR_CONST) {