[Dotgnu-pnet-commits] CVS: pnet/engine verify_branch.c,1.12,1.13

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv4264/engine

Modified Files:
        verify_branch.c 
Log Message:
Fix Segfault on null-null merges


Index: verify_branch.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/verify_branch.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** verify_branch.c     24 Jul 2003 18:24:06 -0000      1.12
--- verify_branch.c     25 Jul 2003 02:47:26 -0000      1.13
***************
*** 123,127 ****
  {
        ILClass *classInfo;
!       
        /* Note: boxing conversions are not allowed because both
         * types have to be reference types.
--- 123,130 ----
  {
        ILClass *classInfo;
! 
!       if(type1==NULL) return type2;
!       if(type2==NULL) return type1;
! 
        /* Note: boxing conversions are not allowed because both
         * types have to be reference types.
***************
*** 146,150 ****
   * TODO: handle interfaces
   */
! static ILType * CommonType(ILImage * image, ILType *type1, ILType *type2)
  {
        ILType *ctype12=TryCommonType(image, type1, type2);
--- 149,154 ----
   * TODO: handle interfaces
   */
! static int CommonType(ILImage * image, ILType *type1, ILType *type2,
!                                               ILType** commonType)
  {
        ILType *ctype12=TryCommonType(image, type1, type2);
***************
*** 153,163 ****
        if(ILTypeAssignCompatibleNonBoxing(image, ctype12, ctype21))
        {
!               return ctype12;
        }
        else if(ILTypeAssignCompatibleNonBoxing(image, ctype21, ctype12))
        {
!               return ctype21;
        }
!       return NULL;
  }
  
--- 157,169 ----
        if(ILTypeAssignCompatibleNonBoxing(image, ctype12, ctype21))
        {
!               (*commonType) = ctype12;
!               return 1;
        }
        else if(ILTypeAssignCompatibleNonBoxing(image, ctype21, ctype12))
        {
!               (*commonType) = ctype21;
!               return 1;
        }
!       return 0;
  }
  
***************
*** 195,202 ****
                else if(stack[posn].engineType == ILEngineType_O)
                {
!                       commonType=CommonType(image,
!                                                                 
stack[posn].typeInfo,
!                                                                 
labelStack[posn].typeInfo);
!                       if(commonType==NULL)
                        {
                                return 0;
--- 201,206 ----
                else if(stack[posn].engineType == ILEngineType_O)
                {
!                       if(!CommonType(image, stack[posn].typeInfo,
!                                               labelStack[posn].typeInfo, 
&commonType))
                        {
                                return 0;