From 7eb0be61273e009d716df175d8c321dea5230859 Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 19 Nov 2019 22:47:39 +0000 Subject: [PATCH] Fix invalid typecast revealed by -CriotR by changing order of terms in boolean expression git-svn-id: trunk@43515 - --- compiler/nutils.pas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/nutils.pas b/compiler/nutils.pas index d9f3a809b5..ee950b98f5 100644 --- a/compiler/nutils.pas +++ b/compiler/nutils.pas @@ -780,8 +780,9 @@ implementation else if not((tloadnode(p).symtableentry.typ in [staticvarsym,localvarsym,paravarsym,fieldvarsym]) and (tabstractvarsym(tloadnode(p).symtableentry).varregable in [vr_intreg,vr_mmreg,vr_fpureg])) then inc(result); - if not(tabstractvarsym(tloadnode(p).symtableentry).varregable=vr_addr) and - (tloadnode(p).symtableentry.typ=paravarsym) and tloadnode(p).is_addr_param_load then + if (tloadnode(p).symtableentry.typ=paravarsym) and + not(tabstractvarsym(tloadnode(p).symtableentry).varregable=vr_addr) and + tloadnode(p).is_addr_param_load then inc(result); if (result >= NODE_COMPLEXITY_INF) then result := NODE_COMPLEXITY_INF;