[dotgnu-pnet-commits] pnet ChangeLog image/generic_class.c image/gene...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      07/10/11 19:31:52

Modified files:
        .              : ChangeLog 
        image          : generic_class.c generic_member.c 

Log message:
        Fix a method resolution bug with SWF apps compiled with csc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3504&r2=1.3505
http://cvs.savannah.gnu.org/viewcvs/pnet/image/generic_class.c?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pnet/image/generic_member.c?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3504
retrieving revision 1.3505
diff -u -b -r1.3504 -r1.3505
--- ChangeLog   10 Oct 2007 12:14:47 -0000      1.3504
+++ ChangeLog   11 Oct 2007 19:31:51 -0000      1.3505
@@ -1,3 +1,13 @@
+2007-10-11  Klaus Treichel  <address@hidden>
+
+       * image/generic_class.c: Fix a warning by casting the event to an
+       ILEvent instead of an ILField in ExpandInstantiations.
+       Return the member instaed of 0 if the owner is no generic instance in
+       ILClassGetMemberInstance.
+
+       * image/generic_member.c: Remove the unused local variable owner to fix
+       a compiler warning.
+       
 2007-10-10  Radek Polak  <address@hidden>
 
        * support/serial.c: Fix warnings on cygwin.

Index: image/generic_class.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/generic_class.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- image/generic_class.c       14 Sep 2007 12:09:12 -0000      1.1
+++ image/generic_class.c       11 Oct 2007 19:31:52 -0000      1.2
@@ -178,7 +178,7 @@
                        case IL_META_MEMBERKIND_EVENT:
                        {
                                /* Create a new event */
-                               newEvent = (ILField 
*)ILMemberCreateInstance(member, classInfo);
+                               newEvent = (ILEvent 
*)ILMemberCreateInstance(member, classInfo);
 
                                if(!newEvent)
                                {
@@ -312,7 +312,9 @@
 
        if(!ILClass_IsGenericInstance(owner))
        {
-               return 0;
+               /* simply return the member if the owner is no generic
+                  instantiation */
+               return member;
        }
 
        while(memberInst != 0)

Index: image/generic_member.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/generic_member.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- image/generic_member.c      14 Sep 2007 12:09:12 -0000      1.1
+++ image/generic_member.c      11 Oct 2007 19:31:52 -0000      1.2
@@ -406,7 +406,6 @@
        ILMethod *genMethod;
        ILMethod *virtAncestor;
        ILType *mspecTypeArgs;
-       ILClass *owner;
        ILImage *image;
 
        if(ILMember_IsGenericInstance((ILMember *)methodCaller))