external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Introduce usage of __builtin_unreachable() and noreturn (#248)

Browse source 
This commit adds an UNREACHABLE() macro that expands to either the
__builtin_unreachable() compiler builtin (for release builds) or
abort(3) (for development builds). This is used to mark code paths
that are never to be reached.

It also adds the 'noreturn' attribute to functions that never
return: path_exec(), sh_done() and sh_syntax(). The UNREACHABLE()
macro is not added after calling these.

The purpose of these is:
* to slightly improve GCC/Clang compiler optimizations;
* to fix a few compiler warnings;
* to add code clarity.

Changes of note:

src/cmd/ksh93/sh/io.c: outexcept():
- Avoid using __builtin_unreachable() here since errormsg can
  return despite using ERROR_system(1), as shp->jmplist->mode is
  temporarily set to 0. See: https://github.com/att/ast/issues/1336

src/cmd/ksh93/tests/io.sh:
- Add a regression test for the ksh2020 bug referenced above.

src/lib/libast/features/common:
- Detect the existence of either the C11 stdnoreturn.h header or
  the GCC noreturn attribute, preferring the former when available.
- Test for the existence of __builtin_unreachable(). Use it for
  release builds. On development builds, use abort() instead, which
  crahses reliably for debugging when unreachable code is reached.

Co-authored-by: Martijn Dekker <martijn@inlv.org>
This commit is contained in:
Johnothan King 2021-04-04 16:28:24 -07:00 • committed by GitHub
parent 56913f8c2a
commit c4f980eb29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 1170 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/cmd/ksh93/sh/array.c
View file

@ -229,7 +229,10 @@ static union Value *array_getup(Namval_t *np, Namarr_t *arp, int update)
else
{
if(ap->cur >= ap->maxi)
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript,nv_name(np));
UNREACHABLE();
}
up = &(ap->val[ap->cur]);
nofree = array_isbit(ap->bits,ap->cur,ARRAY_NOFREE);
}
@ -367,7 +370,10 @@ static Namval_t *array_find(Namval_t *np,Namarr_t *arp, int flag)
if(!(ap->header.nelem&ARRAY_SCAN) && ap->cur >= ap->maxi)
ap = array_grow(np, ap, (int)ap->cur);
if(ap->cur>=ap->maxi)
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript,nv_name(np));
UNREACHABLE();
}
up = &(ap->val[ap->cur]);
if((!up->cp||up->cp==Empty) && nv_type(np) && nv_isvtree(np))
{
@ -810,7 +816,10 @@ static struct index_array *array_grow(Namval_t *np, register struct index_array
register int i;
register int newsize = arsize(arp,maxi+1);
if (maxi >= ARRAY_MAX)
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript, fmtbase((long)maxi,10,0));
UNREACHABLE();
}
i = (newsize-1)*sizeof(union Value*)+newsize;
ap = new_of(struct index_array,i);
memset((void*)ap,0,sizeof(*ap)+i);
@ -895,7 +904,10 @@ int nv_atypeindex(Namval_t *np, const char *tname)
{
struct index_array *ap = (struct index_array*)nv_arrayptr(np);
if(!nv_hasdisc(tp,&ENUM_disc))
{
errormsg(SH_DICT,ERROR_exit(1),e_notenum,tp->nvname);
UNREACHABLE();
}
if(!ap)
ap = array_grow(np,ap,1);
ap->xp = sh_calloc(NV_MINSZ,1);
@ -907,7 +919,7 @@ int nv_atypeindex(Namval_t *np, const char *tname)
return(1);
}
errormsg(SH_DICT,ERROR_exit(1),e_unknowntype, n,tname);
return(0);
UNREACHABLE();
}
Namarr_t *nv_arrayptr(register Namval_t *np)
@ -1187,7 +1199,7 @@ Namval_t *nv_putsub(Namval_t *np,register char *sp,register long mode)
if(size >= ARRAY_MAX || (size < 0))
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript, nv_name(np));
return(NIL(Namval_t*));
UNREACHABLE();
}
if(!ap || size>=ap->maxi)
{
@ -1406,6 +1418,7 @@ static int array_fixed_init(Namval_t *np, char *sub, char *cp)
{
free((void*)ap);
errormsg(SH_DICT,ERROR_exit(1),e_subscript, nv_name(np));
UNREACHABLE();
}
cp[-1] = ']';
}
@ -1442,18 +1455,27 @@ static char *array_fixed(Namval_t *np, char *sub, char *cp,int mode)
size = (int)sh_arith(&sh,(char*)sub);
fp->cur[n] = size;
if(size >= fp->max[n] || (size < 0))
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript, nv_name(np));
UNREACHABLE();
}
*cp++ = ']';
sz = fp->curi + fp->cur[n]*fp->incr[n];
for(n++,ep=cp;*ep=='['; ep=cp,n++)
{
if(n >= fp->ndim)
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript, nv_name(np));
UNREACHABLE();
}
cp = nv_endsubscript(np,ep,0);
cp[-1]=0;
size = (int)sh_arith(&sh,(char*)ep+1);
if(size >= fp->max[n] || (size < 0))
{
errormsg(SH_DICT,ERROR_exit(1),e_subscript, nv_name(np));
UNREACHABLE();
}
fp->cur[n] = size;
cp[-1] = ']';
sz += fp->cur[n]*fp->incr[n];
@ -1793,7 +1815,10 @@ void nv_setvec(register Namval_t *np,int append,register int argc,register char
{
ap = (struct index_array*)nv_arrayptr(np);
if(ap && is_associative(ap))
{
errormsg(SH_DICT,ERROR_exit(1),"cannot append indexed array to associative array %s",nv_name(np));
UNREACHABLE();
}
}
if(append)
{