Fix and tests for [perl #28123] Perl optimizes // away incorrectly

p4raw-id: //depot/perl@22625

1 files changed, 3 insertions, 1 deletions

diff --git a/op.c b/op.c
index a13a7ef1b9..25db0927b6 100644
--- a/op.c
+++ b/op.c
@@ -3368,7 +3368,9 @@ S_new_logop(pTHX_ I32 type, I32 flags, OP** firstp, OP** otherp)
 	    no_bareword_allowed(first);
 	else if (ckWARN(WARN_BAREWORD) && (first->op_private & OPpCONST_BARE))
 		Perl_warner(aTHX_ packWARN(WARN_BAREWORD), "Bareword found in conditional");
-	if ((type == OP_AND) == (SvTRUE(((SVOP*)first)->op_sv))) {
+	if ((type == OP_AND &&  SvTRUE(((SVOP*)first)->op_sv)) ||
+	    (type == OP_OR  && !SvTRUE(((SVOP*)first)->op_sv)) ||
+	    (type == OP_DOR && !SvOK(((SVOP*)first)->op_sv))) {
 	    op_free(first);
 	    *firstp = Nullop;
 	    other->op_private |= OPpCONST_SHORTCIRCUIT;