dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/codegen cg_resolve.c,1.11,1.12


From: Gopal.V <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/codegen cg_resolve.c,1.11,1.12
Date: Mon, 16 Dec 2002 13:18:48 -0500

Update of /cvsroot/dotgnu-pnet/pnet/codegen
In directory subversions:/tmp/cvs-serv27431/codegen

Modified Files:
        cg_resolve.c 
Log Message:
Fix infinite loop in indirect conversions


Index: cg_resolve.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_resolve.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** cg_resolve.c        16 Nov 2002 08:11:42 -0000      1.11
--- cg_resolve.c        16 Dec 2002 18:18:46 -0000      1.12
***************
*** 41,45 ****
                                                           ILType **args, int 
numArgs,
                                                       ILType *returnType, 
ILUInt32 attrs,
!                                                          int normalOrVirtual, 
int dontInherit)
  {
        ILMember *member;
--- 41,46 ----
                                                           ILType **args, int 
numArgs,
                                                       ILType *returnType, 
ILUInt32 attrs,
!                                                          int normalOrVirtual, 
int dontInherit,
!                                                          int indirect)
  {
        ILMember *member;
***************
*** 95,99 ****
                                if(!ILTypeIdentical(argType, args[arg - 1]))
                                {
!                                       if(!ILCanCoerce(info, args[arg - 1], 
argType,1))
                                        {
                                                break;
--- 96,101 ----
                                if(!ILTypeIdentical(argType, args[arg - 1]))
                                {
!                                       if(!ILCanCoerceKind(info, args[arg - 
1], argType,
!                                                                       
IL_CONVERT_STANDARD,indirect))
                                        {
                                                break;
***************
*** 136,140 ****
                                                                           
callScope, name, args, numArgs,
                                                                           
returnType, attrs, normalOrVirtual,
!                                                                          
dontInherit);
                                if(method)
                                {
--- 138,142 ----
                                                                           
callScope, name, args, numArgs,
                                                                           
returnType, attrs, normalOrVirtual,
!                                                                          
dontInherit,indirect);
                                if(method)
                                {
***************
*** 159,163 ****
  {
        return ResolveMethod(info, classInfo, callScope, name, args, numArgs, 0,
!                                            IL_META_METHODDEF_STATIC, 0, 0);
  }
  
--- 161,165 ----
  {
        return ResolveMethod(info, classInfo, callScope, name, args, numArgs, 0,
!                                            IL_META_METHODDEF_STATIC, 0, 0, 1);
  }
  
***************
*** 167,171 ****
  {
        return ResolveMethod(info, classInfo, callScope, name,
!                                                args, numArgs, 0, 0, 1, 0);
  }
  
--- 169,173 ----
  {
        return ResolveMethod(info, classInfo, callScope, name,
!                                                args, numArgs, 0, 0, 1, 0, 1);
  }
  
***************
*** 176,180 ****
                                                 args, numArgs, ILType_Void,
                                             IL_META_METHODDEF_SPECIAL_NAME |
!                                            IL_META_METHODDEF_RT_SPECIAL_NAME, 
0, 1);
  }
  
--- 178,182 ----
                                                 args, numArgs, ILType_Void,
                                             IL_META_METHODDEF_SPECIAL_NAME |
!                                            IL_META_METHODDEF_RT_SPECIAL_NAME, 
0, 1, 1);
  }
  
***************
*** 202,206 ****
                                                 name, args, 1, 0,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0);
  }
  
--- 204,208 ----
                                                 name, args, 1, 0,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0, 1);
  }
  
***************
*** 215,219 ****
                                                 name, args, 2, 0,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0);
  }
  
--- 217,221 ----
                                                 name, args, 2, 0,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0, 1);
  }
  
***************
*** 227,231 ****
                                                 name, args, 1, toType,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0);
  }
  
--- 229,233 ----
                                                 name, args, 1, toType,
                                             IL_META_METHODDEF_STATIC |
!                                            IL_META_METHODDEF_SPECIAL_NAME, 0, 
0, 0);
  }
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]