utah rcsid 1.10 87/04/18 18:20:15: Another screwup -- must distinguish

constant addresses from constant values in the conversion code.

SCCS-vsn: old/pcc/ccom.tahoe/local2.c 1.19

diff --git a/usr/src/old/pcc/ccom.tahoe/local2.c b/usr/src/old/pcc/ccom.tahoe/local2.c
index 3b63cc9..cd1be2e 100644 (file)
--- a/usr/src/old/pcc/ccom.tahoe/local2.c
+++ b/usr/src/old/pcc/ccom.tahoe/local2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)local2.c   1.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)local2.c   1.19 (Berkeley) %G%";

 #endif
 
 # include "pass2.h"
 #endif
 
 # include "pass2.h"


@@ -737,7 +737,13 @@ sconv(p, forcc)
                srctype = src->in.type;
        }
 
                srctype = src->in.type;
        }
 

-       if (src->in.op == ICON) {
+       if (src->in.op == ICON &&
+#ifdef FLEXNAMES
+           (src->tn.name == NULL || *src->tn.name == '\0')
+#else
+           src->tn.name[0] == '\0'
+#endif
+       ) {

                if (src->tn.lval == 0) {
                        putstr("clr");
                        prtype(dst);
                if (src->tn.lval == 0) {
                        putstr("clr");
                        prtype(dst);