[Ikvm-commit] ikvm/runtime DynamicTypeWrapper.cs, 1.252, 1.253 ExceptionHelper.cs, 1.69, 1.70 TypeWrapper.cs, 1.473, 1.474

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/runtime
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11613

Modified Files:
	DynamicTypeWrapper.cs ExceptionHelper.cs TypeWrapper.cs 
Log Message:
Include full class name of anonymous classes in stack trace (i.e. including the "/<identityHashCode>" suffix.)

Index: TypeWrapper.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/runtime/TypeWrapper.cs,v
retrieving revision 1.473
retrieving revision 1.474
diff -C2 -d -r1.473 -r1.474
*** TypeWrapper.cs	1 Jul 2014 15:12:34 -0000	1.473
--- TypeWrapper.cs	4 Jul 2014 11:06:06 -0000	1.474
***************
*** 1948,1951 ****
--- 1948,1952 ----
  		ClassFormatError = 16,
  		HasUnsupportedAbstractMethods = 32,
+ 		Anonymous = 64,
  	}
  
***************
*** 2365,2368 ****
--- 2366,2375 ----
  		}
  
+ 		// is this an anonymous class (in the sense of Unsafe.defineAnonymousClass(), not the JLS)
+ 		internal bool IsUnsafeAnonymous
+ 		{
+ 			get { return (flags & TypeFlags.Anonymous) != 0; }
+ 		}
+ 
  		// a ghost is an interface that appears to be implemented by a .NET type
  		// (e.g. System.String (aka java.lang.String) appears to implement java.lang.CharSequence,

Index: ExceptionHelper.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/runtime/ExceptionHelper.cs,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** ExceptionHelper.cs	13 Jun 2014 06:54:06 -0000	1.69
--- ExceptionHelper.cs	4 Jul 2014 11:06:06 -0000	1.70
***************
*** 341,344 ****
--- 341,350 ----
  					return DotNetTypeWrapper.GetName(type);
  				}
+ #if !FIRST_PASS
+ 				if(tw.IsUnsafeAnonymous)
+ 				{
+ 					return tw.ClassObject.getName();
+ 				}
+ #endif
  				return tw.Name;
  			}

Index: DynamicTypeWrapper.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/runtime/DynamicTypeWrapper.cs,v
retrieving revision 1.252
retrieving revision 1.253
diff -C2 -d -r1.252 -r1.253
*** DynamicTypeWrapper.cs	1 Jul 2014 15:12:34 -0000	1.252
--- DynamicTypeWrapper.cs	4 Jul 2014 11:06:06 -0000	1.253
***************
*** 113,117 ****
  		internal DynamicTypeWrapper(TypeWrapper host, ClassFile f, ClassLoaderWrapper classLoader, ProtectionDomain pd)
  #endif
! 			: base(f.IsInternal ? TypeFlags.InternalAccess : TypeFlags.None, f.Modifiers, f.Name)
  		{
  			Profiler.Count("DynamicTypeWrapper");
--- 113,117 ----
  		internal DynamicTypeWrapper(TypeWrapper host, ClassFile f, ClassLoaderWrapper classLoader, ProtectionDomain pd)
  #endif
! 			: base(f.IsInternal ? TypeFlags.InternalAccess : host != null ? TypeFlags.Anonymous : TypeFlags.None, f.Modifiers, f.Name)
  		{
  			Profiler.Count("DynamicTypeWrapper");