Changeset 609

Timestamp:

08/09/10 21:39:13 (14 years ago)

Author:

walter

Message:

fix segfault with OPnegass

Files:

• branches/dmd-1.x/src/backend/gother.c (modified) (1 diff)
• branches/dmd-1.x/src/win32.mak (modified) (1 diff)
• trunk/src/backend/gother.c (modified) (1 diff)

branches/dmd-1.x/src/backend/gother.c

@@ -477 +477 @@
-
-        elem_debug(d);
-
-        //printf("\trd: "); WReqn(d); printf("\n");
-        if (d->Eoper == OPasm)          /* OPasm elems ruin everything  */
-            goto noprop;
-#if 0
-        // Runs afoul of Buzilla 4506
-        if (OTassign(d->Eoper) && EBIN(d))      // if assignment elem
-#else
-        if (OTassign(d->Eoper))      // if assignment elem
-#endif
-        {   elem *t = Elvalue(d);
-
-            if (t->Eoper == OPvar)
-            {   assert(t->EV.sp.Vsym == sv);
-
-                if (d->Eoper == OPstreq ||
-                    !tyscalar(t->Ety))
-                    goto noprop;        // not worth bothering with these cases
+
+                if (d->Eoper == OPnegass)
+                    goto noprop;        // don't bother with this case, either
-
-                /* Everything must match or we must skip this variable  */
-                /* (in case of assigning to overlapping unions, etc.)   */
-                if (t->EV.sp.Voffset != noff ||
-                    /* If sizes match, we are ok        */
-                    size(t->Ety) != nsize &&
-                        !(d->E2->Eoper == OPconst && size(t->Ety) > nsize && !tyfloating(d->E2->Ety)))
-                    goto noprop;
-            }
-            else
-            {   if (unambig)            /* unambiguous assignments only */
-                    continue;
-                goto noprop;
-            }
-            if (d->Eoper != OPeq)
-                goto noprop;
-        }
-        else                            /* must be a call elem          */
-        {
-            if (unambig)

branches/dmd-1.x/src/win32.mak

@@ -92 +92 @@
-    debug.obj code.obj cg87.obj cgsched.obj ee.obj csymbol.obj \
-    cgcod.obj cod1.obj cod2.obj cod3.obj cod4.obj cod5.obj outbuf.obj \
-    bcomplex.obj iasm.obj ptrntab.obj aa.obj ti_achar.obj md5.obj
-
-# from ROOT
-
-ROOTOBJS= lstring.obj array.obj gnuc.obj man.obj rmem.obj port.obj root.obj \
-    stringtable.obj dchar.obj response.obj async.obj speller.obj aav.obj
-
-OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
-
-SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \
-    utf.c entity.c identifier.c mtype.c expression.c optimize.c \
-    template.h template.c lexer.c declaration.c cast.c \
-    cond.h cond.c link.c aggregate.h staticassert.h parse.c statement.c \
-    constfold.c version.h version.c inifile.c iasm.c staticassert.c \
-    module.c scope.c dump.c init.h init.c attrib.h attrib.c opover.c \
-    eh.c toctype.c class.c mangle.c bit.c tocsym.c func.c inline.c \
-    access.c complex_t.h unialpha.c irstate.h irstate.c glue.c msc.c \
-    ph.c tk.c s2ir.c todt.c e2ir.c util.c toobj.c cppmangle.c \
-objfile.h 
+
-    typinf.c tocvdebug.c toelfdebug.c mars.h module.h mtype.h dsymbol.h \
-    declaration.h lexer.h expression.h statement.h doc.h doc.c \
-    macro.h macro.c hdrgen.h hdrgen.c arraytypes.h \
-    delegatize.c toir.h toir.c interpret.c traits.c builtin.c \
-    clone.c lib.h libomf.c libelf.c libmach.c arrayop.c \
-    aliasthis.h aliasthis.c json.h json.c unittests.c imphint.c
-
-# From C++ compiler
-
-BACKSRC= $C\cdef.h $C\cc.h $C\oper.h $C\ty.h $C\optabgen.c \
-    $C\global.h $C\parser.h $C\code.h $C\type.h $C\dt.h $C\cgcv.h \
-    $C\el.h $C\iasm.h $C\rtlsym.h $C\html.h \
-    $C\bcomplex.c $C\blockopt.c $C\cg.c $C\cg87.c \
-    $C\cgcod.c $C\cgcs.c $C\cgcv.c $C\cgelem.c $C\cgen.c $C\cgobj.c \
-    $C\cgreg.c $C\var.c \
-    $C\cgsched.c $C\cod1.c $C\cod2.c $C\cod3.c $C\cod4.c $C\cod5.c \
-    $C\code.c $C\symbol.c $C\debug.c $C\dt.c $C\ee.c $C\el.c \
-    $C\evalu8.c $C\go.c $C\gflow.c $C\gdag.c \
-    $C\gother.c $C\glocal.c $C\gloop.c $C\html.c $C\newman.c \
-    $C\nteh.c $C\os.c $C\out.c $C\outbuf.c $C\ptrntab.c $C\rtlsym.c \

trunk/src/backend/gother.c

@@ -477 +477 @@
-
-        elem_debug(d);
-
-        //printf("\trd: "); WReqn(d); printf("\n");
-        if (d->Eoper == OPasm)          /* OPasm elems ruin everything  */
-            goto noprop;
-#if 0
-        // Runs afoul of Buzilla 4506
-        if (OTassign(d->Eoper) && EBIN(d))      // if assignment elem
-#else
-        if (OTassign(d->Eoper))      // if assignment elem
-#endif
-        {   elem *t = Elvalue(d);
-
-            if (t->Eoper == OPvar)
-            {   assert(t->EV.sp.Vsym == sv);
-
-                if (d->Eoper == OPstreq ||
-                    !tyscalar(t->Ety))
-                    goto noprop;        // not worth bothering with these cases
+
+                if (d->Eoper == OPnegass)
+                    goto noprop;        // don't bother with this case, either
-
-                /* Everything must match or we must skip this variable  */
-                /* (in case of assigning to overlapping unions, etc.)   */
-                if (t->EV.sp.Voffset != noff ||
-                    /* If sizes match, we are ok        */
-                    size(t->Ety) != nsize &&
-                        !(d->E2->Eoper == OPconst && size(t->Ety) > nsize && !tyfloating(d->E2->Ety)))
-                    goto noprop;
-            }
-            else
-            {   if (unambig)            /* unambiguous assignments only */
-                    continue;
-                goto noprop;
-            }
-            if (d->Eoper != OPeq)
-                goto noprop;
-        }
-        else                            /* must be a call elem          */
-        {
-            if (unambig)