Improve implementation of EEOP_BOOLTEST_* opcodes.

tglsfdc · tglsfdc · commit d77f014efa7e · 2017-03-26T15:57:02.000-04:00
Both Andres and I were happy with "*op-&gt;resvalue = *op-&gt;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-&gt;resnull when it's already
known to have the right value.
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -958,43 +958,49 @@ 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();
 		}
 
 		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();
 		}
 
 		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();
 		}
 
 		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();
 		}
