Revert "/* NOTREACHED */ belongs *before* the unreachable."

This reverts commit 148f39b7de6eae9ddd59e0b0aff691d6abea7aca.

(Still needs more work, but wanted to see how well this passed with Jenkins.)

diff --git a/malloc.c b/malloc.c
index 2ba76b1..a99663e 100644 (file)
--- a/malloc.c
+++ b/malloc.c
@@ -1056,8 +1056,7 @@ emergency_sbrk(MEM_SIZE size)
   do_croak:
     MALLOC_UNLOCK;
     emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack));
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     return NULL;
 }
 

diff --git a/mg.c b/mg.c
index b30e074..3a0f18b 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -350,8 +350,7 @@ Perl_mg_size(pTHX_ SV *sv)
            Perl_croak(aTHX_ "Size magic not implemented");
 
     }
-    /* NOTREACHED */
-    NOT_REACHED;
+    NOT_REACHED; /* NOTREACHED */
 }
 
 /*

diff --git a/op.c b/op.c
index 791a97f..9be7188 100644 (file)
--- a/op.c
+++ b/op.c
@@ -11719,7 +11719,6 @@ Perl_custom_op_get_field(pTHX_ const OP *o, const xop_flags_enum field)
                    any.xop_peep = xop->xop_peep;
                    break;
                default:
-                   /* NOTREACHED */
                    NOT_REACHED;
                    break;
                }
@@ -11738,7 +11737,6 @@ Perl_custom_op_get_field(pTHX_ const OP *o, const xop_flags_enum field)
                    any.xop_peep = XOPd_xop_peep;
                    break;
                default:
-                   /* NOTREACHED */
                    NOT_REACHED;
                    break;
                }

diff --git a/perl.c b/perl.c
index 012d94f..9e0d2b5 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2411,8 +2411,7 @@ S_run_body(pTHX_ I32 oldscope)
        CALLRUNOPS(aTHX);
     }
     my_exit(0);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
 }
 
 /*
@@ -2739,8 +2738,7 @@ Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
            FREETMPS;
            JMPENV_POP;
            my_exit_jump();
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        case 3:
            if (PL_restartop) {
                PL_restartjmpenv = NULL;
@@ -2849,8 +2847,7 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags)
        FREETMPS;
        JMPENV_POP;
        my_exit_jump();
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
     case 3:
        if (PL_restartop) {
            PL_restartjmpenv = NULL;
@@ -4868,8 +4865,7 @@ Perl_call_list(pTHX_ I32 oldscope, AV *paramList)
            CopLINE_set(PL_curcop, oldline);
            JMPENV_POP;
            my_exit_jump();
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        case 3:
            if (PL_restartop) {
                PL_curcop = &PL_compiling;

diff --git a/pp.c b/pp.c
index d7fadd7..4e2d26a 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -2063,8 +2063,7 @@ Perl_do_ncmp(pTHX_ SV* const left, SV * const right)
                    return (leftuv > (UV)rightiv) - (leftuv < (UV)rightiv);
                }
            }
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
     }
 #endif
     {

diff --git a/pp_ctl.c b/pp_ctl.c
index c74e21e..8957a8c 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -292,8 +292,7 @@ PP(pp_substcont)
            POPSUBST(cx);
            PERL_ASYNC_CHECK();
            RETURNOP(pm->op_next);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        }
        cx->sb_iters = saviters;
     }
@@ -1359,8 +1358,7 @@ Perl_block_gimme(pTHX)
     default:
        Perl_croak(aTHX_ "panic: bad gimme: %d\n", cxstack[cxix].blk_gimme);
     }
-    /* NOTREACHED */
-    NOT_REACHED;
+    NOT_REACHED; /* NOTREACHED */
 }
 
 I32
@@ -1693,15 +1691,13 @@ Perl_die_unwind(pTHX_ SV *msv)
            PL_restartjmpenv = restartjmpenv;
            PL_restartop = restartop;
            JMPENV_JUMP(3);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        }
     }
 
     write_to_stderr(exceptsv);
     my_failure_exit();
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
 }
 
 PP(pp_xor)
@@ -3248,8 +3244,7 @@ S_docatch(pTHX_ OP *o)
        JMPENV_POP;
        PL_op = oldop;
        JMPENV_JUMP(ret);
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
     }
     JMPENV_POP;
     PL_op = oldop;
@@ -3348,8 +3343,7 @@ S_try_yyparse(pTHX_ int gramtype)
     default:
        JMPENV_POP;
        JMPENV_JUMP(ret);
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
     }
     JMPENV_POP;
     return ret;
@@ -4342,8 +4336,7 @@ PP(pp_leaveeval)
                         SvUTF8(namesv) ? -(I32)SvCUR(namesv) : (I32)SvCUR(namesv),
                        G_DISCARD);
        Perl_die(aTHX_ "%"SVf" did not return a true value", SVfARG(namesv));
-        /* NOTREACHED */
-        NOT_REACHED;
+        NOT_REACHED; /* NOTREACHED */
        /* die_unwind() did LEAVE, or we won't be here */
     }
     else {

diff --git a/pp_pack.c b/pp_pack.c
index a622d92..f877fe2 100644 (file)
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -567,8 +567,7 @@ S_group_end(pTHX_ const char *patptr, const char *patend, char ender)
     }
     Perl_croak(aTHX_ "No group ending character '%c' found in template",
                ender);
-    /* NOTREACHED */
-    NOT_REACHED;
+    NOT_REACHED; /* NOTREACHED */
 }
 
 

diff --git a/pp_sys.c b/pp_sys.c
index cd88e34..a34df63 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -520,8 +520,7 @@ PP(pp_die)
        }
     }
     die_sv(exsv);
-    /* NOTREACHED */
-    NOT_REACHED;
+    NOT_REACHED; /* NOTREACHED */
     return NULL; /* avoid missing return from non-void function warning */
 }
 

diff --git a/regcomp.c b/regcomp.c
index daeb2e4..1a0024f 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -10347,8 +10347,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth)
        }
        else
            FAIL("Junk on end of regexp");      /* "Can't happen". */
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
     }
 
     if (RExC_in_lookbehind) {

diff --git a/regexec.c b/regexec.c
index 39a8a06..1aafcc7 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -487,8 +487,7 @@ S_isFOO_lc(pTHX_ const U8 classnum, const U8 character)
             Perl_croak(aTHX_ "panic: isFOO_lc() has an unexpected character class '%d'", classnum);
     }
 
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     return FALSE;
 }
 
@@ -543,8 +542,7 @@ S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8* character)
                                                below 256 */
     }
 
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     return FALSE;
 }
 
@@ -2013,8 +2011,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
 
                 default:
                     Perl_croak(aTHX_ "panic: find_byclass() node %d='%s' has an unexpected character class '%d'", OP(c), PL_reg_name[OP(c)], classnum);
-                    /* NOTREACHED */
-                    assert(0);
+                    assert(0); /* NOTREACHED */
             }
         }
         break;
@@ -3814,8 +3811,7 @@ S_setup_EXACTISH_ST_c1_c2(pTHX_ const regnode * const text_node, int *c1p,
 
                     default:
                         Perl_croak(aTHX_ "panic: Unexpected op %u", OP(text_node));
-                        /* NOTREACHED */
-                        assert(0);
+                        assert(0); /* NOTREACHED */
                 }
             }
         }
@@ -4064,8 +4060,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
                               REPORT_CODE_OFF+depth*2, "", PL_colors[4], PL_colors[5])
                 );
                 sayNO_SILENT;
-                /* NOTREACHED */
-                assert(0);
+                assert(0); /* NOTREACHED */
             }
             /* FALLTHROUGH */
        case TRIE:  /* (ab|cd)  */
@@ -4252,8 +4247,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
                );
                goto trie_first_try; /* jump into the fail handler */
            }}
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case TRIE_next_fail: /* we failed - try next alternative */
         {
@@ -4367,8 +4361,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
 
            if (ST.accepted > 1 || has_cutgroup) {
                PUSH_STATE_GOTO(TRIE_next, scan, (char*)uc);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
            }
            /* only one choice left - just continue */
            DEBUG_EXECUTE_r({
@@ -4392,8 +4385,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
 
            locinput = (char*)uc;
            continue; /* execute rest of RE */
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
         }
 #undef  ST
 
@@ -5202,8 +5194,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
             /* and then jump to the code we share with EVAL */
             goto eval_recurse_doit;
 
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case EVAL:  /*   /(?{A})B/   /(??{A})B/  and /(?(?{A})X|Y)B/   */        
             if (cur_eval && cur_eval->locinput==locinput) {
@@ -5484,8 +5475,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
                cur_eval = st;
                /* now continue from first node in postoned RE */
                PUSH_YES_STATE_GOTO(EVAL_AB, startpoint, locinput);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
        }
 
        case EVAL_AB: /* cleanup after a successful (??{A})B */
@@ -5744,22 +5734,19 @@ NULL
            ST.lastloc = NULL;  /* this will be updated by WHILEM */
 
            PUSH_YES_STATE_GOTO(CURLYX_end, PREVOPER(next), locinput);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        }
 
        case CURLYX_end: /* just finished matching all of A*B */
            cur_curlyx = ST.prev_curlyx;
            sayYES;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case CURLYX_end_fail: /* just failed to match all of A*B */
            regcpblow(ST.cp);
            cur_curlyx = ST.prev_curlyx;
            sayNO;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 
 #undef ST
@@ -5794,8 +5781,7 @@ NULL
                REGCP_SET(ST.lastcp);
 
                PUSH_STATE_GOTO(WHILEM_A_pre, A, locinput);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
            }
 
            /* If degenerate A matches "", assume A done. */
@@ -5907,8 +5893,7 @@ NULL
                REGCP_SET(ST.lastcp);
                PUSH_YES_STATE_GOTO(WHILEM_B_min, ST.save_curlyx->u.curlyx.B,
                                     locinput);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
            }
 
            /* Prefer A over B for maximal matching. */
@@ -5919,28 +5904,24 @@ NULL
                cur_curlyx->u.curlyx.lastloc = locinput;
                REGCP_SET(ST.lastcp);
                PUSH_STATE_GOTO(WHILEM_A_max, A, locinput);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
            }
            goto do_whilem_B_max;
        }
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
 
        case WHILEM_B_min: /* just matched B in a minimal match */
        case WHILEM_B_max: /* just matched B in a maximal match */
            cur_curlyx = ST.save_curlyx;
            sayYES;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case WHILEM_B_max_fail: /* just failed to match B in a maximal match */
            cur_curlyx = ST.save_curlyx;
            cur_curlyx->u.curlyx.lastloc = ST.save_lastloc;
            cur_curlyx->u.curlyx.count--;
            CACHEsayNO;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case WHILEM_A_min_fail: /* just failed to match A in a minimal match */
            /* FALLTHROUGH */
@@ -5950,8 +5931,7 @@ NULL
            cur_curlyx->u.curlyx.lastloc = ST.save_lastloc;
            cur_curlyx->u.curlyx.count--;
            CACHEsayNO;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case WHILEM_A_max_fail: /* just failed to match A in a maximal match */
            REGCP_UNWIND(ST.lastcp);
@@ -5977,8 +5957,7 @@ NULL
            cur_curlyx = cur_curlyx->u.curlyx.prev_curlyx;
            PUSH_YES_STATE_GOTO(WHILEM_B_max, ST.save_curlyx->u.curlyx.B,
                                 locinput);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case WHILEM_B_min_fail: /* just failed to match B in a minimal match */
            cur_curlyx = ST.save_curlyx;
@@ -6012,8 +5991,7 @@ NULL
            PUSH_STATE_GOTO(WHILEM_A_min,
                /*A*/ NEXTOPER(ST.save_curlyx->u.curlyx.me) + EXTRA_STEP_2ARGS,
                 locinput);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 #undef  ST
 #define ST st->u.branch
@@ -6038,15 +6016,13 @@ NULL
            } else {
                PUSH_STATE_GOTO(BRANCH_next, scan, locinput);
            }
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
         case CUTGROUP:  /*  /(*THEN)/  */
             sv_yes_mark = st->u.mark.mark_name = scan->flags ? NULL :
                 MUTABLE_SV(rexi->data->data[ ARG( scan ) ]);
             PUSH_STATE_GOTO(CUTGROUP_next, next, locinput);
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case CUTGROUP_next_fail:
             do_cutgroup = 1;
@@ -6054,13 +6030,11 @@ NULL
             if (st->u.mark.mark_name)
                 sv_commit = st->u.mark.mark_name;
             sayNO;         
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case BRANCH_next:
             sayYES;
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
        case BRANCH_next_fail: /* that branch failed; try the next, if any */
            if (do_cutgroup) {
@@ -6082,8 +6056,7 @@ NULL
                sayNO_SILENT;
             }
            continue; /* execute next BRANCH[J] op */
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
     
        case MINMOD: /* next op will be non-greedy, e.g. A*?  */
            minmod = 1;
@@ -6127,8 +6100,7 @@ NULL
 
          curlym_do_A: /* execute the A in /A{m,n}B/  */
            PUSH_YES_STATE_GOTO(CURLYM_A, ST.A, locinput); /* match A */
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case CURLYM_A: /* we've just matched an A */
            ST.count++;
@@ -6263,8 +6235,7 @@ NULL
            }
            
            PUSH_STATE_GOTO(CURLYM_B, ST.B, locinput); /* match B */
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case CURLYM_B_fail: /* just failed to match a B */
            REGCP_UNWIND(ST.cp);
@@ -6442,8 +6413,7 @@ NULL
                REGCP_SET(ST.cp);
                goto curly_try_B_max;
            }
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 
        case CURLY_B_min_known_fail:
@@ -6519,8 +6489,7 @@ NULL
                }
                PUSH_STATE_GOTO(CURLY_B_min_known, ST.B, locinput);
            }
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 
        case CURLY_B_min_fail:
@@ -6553,8 +6522,7 @@ NULL
                }
            }
             sayNO;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 
        curly_try_B_max:
@@ -6585,8 +6553,7 @@ NULL
                 if (ST.c1 == CHRTEST_VOID || could_match) {
                    CURLY_SETPAREN(ST.paren, ST.count);
                    PUSH_STATE_GOTO(CURLY_B_max, ST.B, locinput);
-                   /* NOTREACHED */
-                   assert(0);
+                   assert(0); /* NOTREACHED */
                }
            }
            /* FALLTHROUGH */
@@ -6705,8 +6672,7 @@ NULL
            
            /* execute body of (?...A) */
            PUSH_YES_STATE_GOTO(IFMATCH_A, NEXTOPER(NEXTOPER(scan)), newstart);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
         }
 
        case IFMATCH_A_fail: /* body of (?...A) failed */
@@ -6746,8 +6712,7 @@ NULL
            if (!scan->flags)
                sv_yes_mark = sv_commit = MUTABLE_SV(rexi->data->data[ ARG( scan ) ]);
            PUSH_STATE_GOTO(COMMIT_next, next, locinput);
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
        case COMMIT_next_fail:
            no_final = 1;    
@@ -6755,8 +6720,7 @@ NULL
 
        case OPFAIL:   /* (*FAIL)  */
            sayNO;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
 
 #define ST st->u.mark
         case MARKPOINT: /*  (*MARK:foo)  */
@@ -6766,14 +6730,12 @@ NULL
             mark_state = st;
             ST.mark_loc = locinput;
             PUSH_YES_STATE_GOTO(MARKPOINT_next, next, locinput);
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case MARKPOINT_next:
             mark_state = ST.prev_mark;
             sayYES;
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case MARKPOINT_next_fail:
             if (popmark && sv_eq(ST.mark_name,popmark)) 
@@ -6794,8 +6756,7 @@ NULL
             sv_yes_mark = mark_state ? 
                 mark_state->u.mark.mark_name : NULL;
             sayNO;
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 
         case SKIP:  /*  (*SKIP)  */
             if (scan->flags) {
@@ -6840,8 +6801,7 @@ NULL
             } 
             no_final = 1; 
             sayNO;
-            /* NOTREACHED */
-            assert(0);
+            assert(0); /* NOTREACHED */
 #undef ST
 
         case LNBREAK: /* \R */
@@ -6875,8 +6835,7 @@ NULL
         /* switch break jumps here */
        scan = next; /* prepare to execute the next op and ... */
        continue;    /* ... jump back to the top, reusing st */
-       /* NOTREACHED */
-       assert(0);
+       assert(0); /* NOTREACHED */
 
       push_yes_state:
        /* push a state that backtracks on success */
@@ -6919,8 +6878,7 @@ NULL
            locinput = pushinput;
            st = newst;
            continue;
-           /* NOTREACHED */
-           assert(0);
+           assert(0); /* NOTREACHED */
        }
     }
 
@@ -7557,8 +7515,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
 
     default:
         Perl_croak(aTHX_ "panic: regrepeat() called with unrecognized node type %d='%s'", OP(p), PL_reg_name[OP(p)]);
-        /* NOTREACHED */
-        assert(0);
+        assert(0); /* NOTREACHED */
 
     }
 

diff --git a/sv.c b/sv.c
index 5436838..e0b08d0 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -4215,8 +4215,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, SV* sstr, const I32 flags)
        else
            Perl_croak(aTHX_ "Bizarre copy of %s", type);
        }
-       /* NOTREACHED */
-       NOT_REACHED;
+       NOT_REACHED; /* NOTREACHED */
 
     case SVt_REGEXP:
       upgregexp:
@@ -14679,8 +14678,7 @@ S_find_uninit_var(pTHX_ const OP *const obase, const SV *const uninit_sv,
            return varname(gv, '$', 0,
                    NULL, (I8)obase->op_private, FUV_SUBSCRIPT_ARRAY);
        }
-       /* NOTREACHED */
-       NOT_REACHED;
+       NOT_REACHED; /* NOTREACHED */
 
     case OP_EXISTS:
        o = cUNOPx(obase)->op_first;
@@ -14782,8 +14780,7 @@ S_find_uninit_var(pTHX_ const OP *const obase, const SV *const uninit_sv,
                ? '@' : '%',
                o->op_targ, NULL, 0, FUV_SUBSCRIPT_WITHIN);
        }
-       /* NOTREACHED */
-       NOT_REACHED;
+       NOT_REACHED; /* NOTREACHED */
     }
 
     case OP_AASSIGN:

diff --git a/utf8.c b/utf8.c
index 264ddb7..060aada 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1423,8 +1423,7 @@ Perl__to_upper_title_latin1(pTHX_ const U8 c, U8* p, STRLEN *lenp, const char S_
                return 'S';
            default:
                Perl_croak(aTHX_ "panic: to_upper_title_latin1 did not expect '%c' to map to '%c'", c, LATIN_SMALL_LETTER_Y_WITH_DIAERESIS);
-               /* NOTREACHED */
-               assert(0);
+               assert(0); /* NOTREACHED */
        }
     }
 
@@ -2454,8 +2453,7 @@ Perl__core_swash_init(pTHX_ const char* pkg, const char* name, SV *listsv, I32 m
                Perl_croak(aTHX_
                           "Can't find Unicode property definition \"%"SVf"\"",
                           SVfARG(retval));
-                /* NOTREACHED */
-                NOT_REACHED;
+                NOT_REACHED; /* NOTREACHED */
        }
     } /* End of calling the module to find the swash */
 

diff --git a/util.c b/util.c
index f5573e1..4666233 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1571,8 +1571,7 @@ Perl_die_sv(pTHX_ SV *baseex)
 {
     PERL_ARGS_ASSERT_DIE_SV;
     croak_sv(baseex);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     NORETURN_FUNCTION_END;
 }
 
@@ -1594,8 +1593,7 @@ Perl_die_nocontext(const char* pat, ...)
     va_list args;
     va_start(args, pat);
     vcroak(pat, &args);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     va_end(args);
     NORETURN_FUNCTION_END;
 }
@@ -1607,8 +1605,7 @@ Perl_die(pTHX_ const char* pat, ...)
     va_list args;
     va_start(args, pat);
     vcroak(pat, &args);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     va_end(args);
     NORETURN_FUNCTION_END;
 }
@@ -1708,8 +1705,7 @@ Perl_croak_nocontext(const char *pat, ...)
     va_list args;
     va_start(args, pat);
     vcroak(pat, &args);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     va_end(args);
 }
 #endif /* PERL_IMPLICIT_CONTEXT */
@@ -1720,8 +1716,7 @@ Perl_croak(pTHX_ const char *pat, ...)
     va_list args;
     va_start(args, pat);
     vcroak(pat, &args);
-    /* NOTREACHED */
-    assert(0);
+    assert(0); /* NOTREACHED */
     va_end(args);
 }