code gen bug in ++ and --

SVN=121476

diff --git a/src/cmd/6g/gen.c b/src/cmd/6g/gen.c
index 700057405d2197e9e4a5a7a38a3bb662234ffc23..09b90ac3a3bc6647f7219290933c9ee70f419b87 100644 (file)
--- a/src/cmd/6g/gen.c
+++ b/src/cmd/6g/gen.c
@@ -694,16 +694,14 @@ cgen_asop(Node *nl, Node *nr, int op)
        regalloc(&n1, nl->type, N);
        if(nl->addable) {
                cgen(nr, &n1);
-               gins(a, nl, &n1);
-               gmove(&n1, nl);
+               gins(a, &n1, nl);
                regfree(&n1);
                return;
        }
 
        igen(nl, &n2, N);
        cgen(nr, &n1);
-       gins(a, &n2, &n1);
-       gmove(&n1, &n2);
+       gins(a, &n1, &n2);
        regfree(&n1);
        regfree(&n2);
 }

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index 4cd88d94dbb17647bbb66fc5b6dfcecb1d336626..199497abf02eef6eb878a8537efbf90377d00d8a 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -208,7 +208,6 @@ enum
        OEQ, ONE, OLT, OLE, OGE, OGT,
        OADD, OSUB, OOR, OXOR,
        OMUL, ODIV, OMOD, OLSH, ORSH, OAND,
-       ODEC, OINC,
        OLEN,
        OFUNC,
        OLABEL,

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 6f1ad12ab2c2b1f025bc1aaa040493f80909cb95..efbef36c43c6f4cb21c82da7b03f5d0cc0abb9fb 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -606,8 +606,6 @@ opnames[] =
        [OOROR]         = "OROR",
        [OOR]           = "OR",
        [OPLUS]         = "PLUS",
-       [ODEC]          = "DEC",
-       [OINC]          = "INC",
        [OREGISTER]     = "REGISTER",
        [OINDREG]       = "INDREG",
        [OSEND]         = "SEND",