Remove unreachable code in expression evaluation.

anarazel · anarazel · commit ad46a2aa79f9 · 2017-03-25T15:35:59.000-07:00
The previous code still contained expression evaluation time support for CaseExprs without a defresult. But transformCaseExpr() creates a default expression if necessary. Author: Andres Freund Discussion: https://postgr.es/m/4834.1490480275@sss.pgh.pa.us
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
@@ -1385,20 +1385,12 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					state->steps[whenstep].d.jump.jumpdone = state->steps_len;
 				}
 
-				if (caseExpr->defresult)
-				{
-					/* evaluate ELSE expr into CASE's result variables */
-					ExecInitExprRec(caseExpr->defresult, parent, state,
-									resv, resnull);
-				}
-				else
-				{
-					/* default ELSE is to return NULL */
-					scratch.opcode = EEOP_CONST;
-					scratch.d.constval.value = (Datum) 0;
-					scratch.d.constval.isnull = true;
-					ExprEvalPushStep(state, &scratch);
-				}
+				/* transformCaseExpr always adds a default */
+				Assert(caseExpr->defresult);
+
+				/* evaluate ELSE expr into CASE's result variables */
+				ExecInitExprRec(caseExpr->defresult, parent, state,
+								resv, resnull);
 
 				/* adjust jump targets */
 				foreach(lc, adjust_jumps)
