diff options
| -rw-r--r-- | src/tools/lcc/src/c.h | 1 | ||||
| -rw-r--r-- | src/tools/lcc/src/enode.c | 3 | ||||
| -rw-r--r-- | src/tools/lcc/src/expr.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/lcc/src/c.h b/src/tools/lcc/src/c.h index 68c8f629..43bec083 100644 --- a/src/tools/lcc/src/c.h +++ b/src/tools/lcc/src/c.h @@ -577,6 +577,7 @@ extern Tree cnsttree(Type, ...); extern Tree consttree(unsigned int, Type); extern Tree eqtree(int, Tree, Tree); extern int iscallb(Tree); +extern int isnullptr(Tree); extern Tree shtree(int, Tree, Tree); extern void typeerror(int, Tree, Tree); diff --git a/src/tools/lcc/src/enode.c b/src/tools/lcc/src/enode.c index 760096de..4a37618c 100644 --- a/src/tools/lcc/src/enode.c +++ b/src/tools/lcc/src/enode.c @@ -5,7 +5,6 @@ static Tree addtree(int, Tree, Tree); static Tree andtree(int, Tree, Tree); static Tree cmptree(int, Tree, Tree); static int compatible(Type, Type); -static int isnullptr(Tree e); static Tree multree(int, Tree, Tree); static Tree subtree(int, Tree, Tree); #define isvoidptr(ty) \ @@ -220,7 +219,7 @@ static int compatible(Type ty1, Type ty2) { && isptr(ty2) && !isfunc(ty2->type) && eqtype(unqual(ty1->type), unqual(ty2->type), 0); } -static int isnullptr(Tree e) { +int isnullptr(Tree e) { Type ty = unqual(e->type); return generic(e->op) == CNST diff --git a/src/tools/lcc/src/expr.c b/src/tools/lcc/src/expr.c index b8cb08b6..96eec217 100644 --- a/src/tools/lcc/src/expr.c +++ b/src/tools/lcc/src/expr.c @@ -621,7 +621,7 @@ Tree cast(Tree p, Type type) { p = simplify(CVP, dst, p, NULL); else { if ((isfunc(src->type) && !isfunc(dst->type)) - || (!isfunc(src->type) && isfunc(dst->type))) + || (!isnullptr(p) && !isfunc(src->type) && isfunc(dst->type))) warning("conversion from `%t' to `%t' is compiler dependent\n", p->type, type); if (src->size != dst->size) |