Skip to content

Instantly share code, notes, and snippets.

View kumpera's full-sized avatar

Rodrigo Kumpera kumpera

View GitHub Profile
Rodrigo-Kumperas-MacBook-Pro:~ kumpera$ cd src/mono/mcs/class/System.Runtime.Serialization
Rodrigo-Kumperas-MacBook-Pro:System.Runtime.Serialization kumpera$ make check
ok=:; make run-test-recursive || ok=false; make run-test-local || ok=false; $ok
MCS [net_4_5] System.Runtime.Serialization_test_net_4_5.dll
Test/System.Runtime.Serialization/DataContractSerializerTest_NullableWithDictionary.cs(36,66): error CS0102: The type `Client.EvalServiceReference.Eval' already contains a definition for `extensionDataField'
Test/System.Runtime.Serialization/Bug2843Test.cs(36,66): (Location of the symbol related to previous error)
Test/System.Runtime.Serialization/DataContractSerializerTest_NullableWithDictionary.cs(39,24): error CS0102: The type `Client.EvalServiceReference.Eval' already contains a definition for `IdField'
Test/System.Runtime.Serialization/Bug2843Test.cs(42,24): (Location of the symbol related to previous error)
Test/System.Runtime.Serialization/DataContractSerializerTest_NullableWithDictionary.cs(48,
diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c
index 1a9ee48..bed8db2 100644
--- a/mono/tests/libtest.c
+++ b/mono/tests/libtest.c
@@ -5076,3 +5076,22 @@ mono_test_marshal_call_callback (void)
return callback ();
}
+LIBTEST_API int STDCALL
+mono_test_marshal_lpstr (char *str)
Attaching to process 39632.
Attaching to process 39632.
Reading symbols for shared libraries . done
Reading symbols for shared libraries .................................... done
0x91a64c5e in semaphore_wait_trap ()
7 0x91a66fda in __wait4 ()
6 0x91a64c5e in semaphore_wait_trap ()
5 0x91a64c5e in semaphore_wait_trap ()
4 0x91a66fda in __wait4 ()
3 0x91a64c5e in semaphore_wait_trap ()
diff --git a/libgc/include/private/gcconfig.h b/libgc/include/private/gcconfig.h
index 8276079..818d93a 100644
--- a/libgc/include/private/gcconfig.h
+++ b/libgc/include/private/gcconfig.h
@@ -325,7 +325,7 @@
These aren't used when dyld support is enabled (it is by default) */
# define DATASTART ((ptr_t) get_etext())
# define DATAEND ((ptr_t) get_end())
-# define STACKBOTTOM ((ptr_t) 0xc0000000)
+# define STACKBOTTOM ((ptr_t) pthread_get_stackaddr_np(pthread_self()))
Running libtoolize...
glibtoolize: putting auxiliary files in `.'.
glibtoolize: copying file `./ltmain.sh'
glibtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
glibtoolize: copying file `m4/libtool.m4'
glibtoolize: copying file `m4/ltoptions.m4'
glibtoolize: copying file `m4/ltsugar.m4'
glibtoolize: copying file `m4/ltversion.m4'
glibtoolize: copying file `m4/lt~obsolete.m4'
Running aclocal -I m4 -I . ...
diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 20d6447..ffb4a57 100644
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -2575,6 +2575,8 @@ finish_gray_stack (char *start_addr, char *end_addr, int generation, GrayQueue *
*/
mono_sgen_bridge_reset_data ();
+ DEBUG (2, fprintf (gc_debug_file, "Bridge reset done"));
+
Target _GetMonoPlatformJarPath:
/Users/kumpera/src/monodroid/monodroid/tools/msbuild/build/Novell/Novell.MonoDroid.Common.targets: error : Could not find mono.android.jar
Task "GetMonoPlatformJar" execution -- FAILED
Done building target "_GetMonoPlatformJarPath" in project "/Users/kumpera/src/monodroid/monodroid/samples/Hello/Hello.csproj".-- FAILED
Done building project "/Users/kumpera/src/monodroid/monodroid/samples/Hello/Hello.csproj".-- FAILED
Build FAILED.
Warnings:
26 System.Array:InternalArray__IEnumerable_GetEnumerator<T> ()
10 System.Decimal:op_Explicit (System.Decimal)
10 System.Collections.Generic.KeyValuePair`2<string, int>:get_Value ()
10 System.Collections.Generic.KeyValuePair`2<string, int>:get_Key ()
10 System.Collections.Generic.KeyValuePair`2<string, int>:ToString ()
10 System.Collections.Generic.KeyValuePair`2<string, int>:.ctor (string,int)
10 System.Collections.Generic.GenericEqualityComparer`1<int>:GetHashCode (int)
10 System.Collections.Generic.GenericEqualityComparer`1<int>:Equals (int,int)
10 System.Collections.Generic.GenericEqualityComparer`1<int>:.ctor ()
10 System.Collections.Generic.EqualityComparer`1<int>:get_Default ()
diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index e0ba446..d38f196 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -3050,6 +3050,34 @@ add_instances_of (MonoAotCompile *acfg, MonoClass *klass, MonoType **insts, int
}
}
+static void
+add_types_from_method_header (MonoAotCompile *acfg, MonoMethod *method)
diff --git a/mcs/class/System.Core/System.Linq/Enumerable.cs b/mcs/class/System.Core/System.Linq/Enumerable.cs
index b128543..bc4d8db 100644
--- a/mcs/class/System.Core/System.Linq/Enumerable.cs
+++ b/mcs/class/System.Core/System.Linq/Enumerable.cs
@@ -2834,6 +2834,9 @@ namespace System.Linq
Func<TSource, TKey> keySelector, IComparer<TKey> comparer)
{
Check.SourceAndKeySelector (source, keySelector);
+ var oe = source as OrderedEnumerable <TSource>;
+ if (oe != null)