From d77f014efa7eda4357fbc851dbf25c6b256ddf35 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 26 Mar 2017 15:57:02 -0400 Subject: [PATCH] Improve implementation of EEOP_BOOLTEST_* opcodes. Both Andres and I were happy with "*op->resvalue = *op->resvalue;", but Coverity isn't; and it has a point, because some compilers might not be smart enough to elide that. So remove it. In passing, also avoid doing unnecessary assignments to *op->resnull when it's already known to have the right value. --- src/backend/executor/execExprInterp.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c index de7fe895f8..02fb29cde3 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -958,10 +958,11 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull) EEO_CASE(EEOP_BOOLTEST_IS_TRUE) { if (*op->resnull) + { *op->resvalue = BoolGetDatum(false); - else - *op->resvalue = *op->resvalue; - *op->resnull = false; + *op->resnull = false; + } + /* else, input value is the correct output as well */ EEO_NEXT(); } @@ -969,10 +970,12 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull) EEO_CASE(EEOP_BOOLTEST_IS_NOT_TRUE) { if (*op->resnull) + { *op->resvalue = BoolGetDatum(true); + *op->resnull = false; + } else *op->resvalue = BoolGetDatum(!DatumGetBool(*op->resvalue)); - *op->resnull = false; EEO_NEXT(); } @@ -980,10 +983,12 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull) EEO_CASE(EEOP_BOOLTEST_IS_FALSE) { if (*op->resnull) + { *op->resvalue = BoolGetDatum(false); + *op->resnull = false; + } else *op->resvalue = BoolGetDatum(!DatumGetBool(*op->resvalue)); - *op->resnull = false; EEO_NEXT(); } @@ -991,10 +996,11 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull) EEO_CASE(EEOP_BOOLTEST_IS_NOT_FALSE) { if (*op->resnull) + { *op->resvalue = BoolGetDatum(true); - else - *op->resvalue = *op->resvalue; - *op->resnull = false; + *op->resnull = false; + } + /* else, input value is the correct output as well */ EEO_NEXT(); } -- 2.40.0