Merge pull request #4419 from BrzVlad/fix-oom-nre
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Thu, 23 Feb 2017 21:14:23 +0000 (13:14 -0800)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2017 21:14:23 +0000 (13:14 -0800)
[sgen] Fix oom nre

206 files changed:
.gitattributes
configure.ac
data/lock-decoder/LockTracerDecoder.cs
docs/.gitattributes [new file with mode: 0644]
docs/abc-removal.txt
external/bockbuild
external/cecil
external/corefx
external/ikvm
libgc/blacklst.c
libgc/doc/README.changes
libgc/doc/README.macros
libgc/mark.c
man/gacutil.1
man/lc.1
man/macpack.1
man/mdb2ppdb.1
man/mdoc.5
man/mkbundle.1
man/mono-config.5
man/mono-service.1
man/mono-xmltool.1
man/mono.1
man/monodocer.1
man/resgen.1
man/sqlsharp.1
mcs/.gitattributes
mcs/CodingStyle
mcs/build/profiles/monodroid.make
mcs/build/profiles/monotouch_runtime.make
mcs/build/profiles/orbis.make
mcs/build/profiles/testing_aot_full.make
mcs/build/profiles/testing_aot_hybrid.make
mcs/build/profiles/winaot.make
mcs/build/profiles/xammac.make
mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
mcs/class/Facades/System.Data.Common/System.Data.Common.dll.sources
mcs/class/Facades/System.Data.Common/TypeForwarders.cs
mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs
mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs
mcs/class/Facades/netstandard/Makefile
mcs/class/Makefile
mcs/class/Microsoft.CSharp/Makefile
mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs [deleted file]
mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
mcs/class/Microsoft.CSharp/corefx/SR.cs [new file with mode: 0644]
mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
mcs/class/Mono.CSharp/Mono.CSharp.dll.sources
mcs/class/Mono.CSharp/aot.cs [new file with mode: 0644]
mcs/class/Mono.CSharp/monotouch.cs [deleted file]
mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/Rewriter.cs
mcs/class/README
mcs/class/System.Core/System.Core-net_4_x.csproj
mcs/class/System.Core/dynamic_System.Core.dll.sources
mcs/class/System.Data/corefx.common.sources
mcs/class/System.Data/net_4_x_System.Data.dll.sources
mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs
mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs
mcs/class/System/System.Net.Sockets/SocketAsyncResult.cs
mcs/class/System/System.Net.Sockets/SocketReceiveFromResult.cs
mcs/class/System/System.Net.Sockets/SocketReceiveMessageFromResult.cs
mcs/class/System/System.Net.Sockets/SocketTaskExtensions.cs
mcs/class/System/System.Net/HttpListenerRequest.cs
mcs/class/System/Test/System.Diagnostics/ProcessTest.cs
mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
mcs/class/System/Test/System.Net.WebSockets/ClientWebSocketTest.cs
mcs/class/corlib/System.Diagnostics.Tracing/EventCounter.cs
mcs/class/corlib/System.Diagnostics.Tracing/EventSource.cs
mcs/class/corlib/System.Reflection.Emit/PEFileKinds.cs
mcs/class/corlib/System.Reflection.Metadata/AssemblyExtensions.cs
mcs/class/corlib/System.Runtime.Loader/AssemblyLoadContext.cs
mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
mcs/class/corlib/System/Array.cs
mcs/class/corlib/Test/System.Threading/ThreadTest.cs
mcs/class/corlib/Test/System.Threading/TimerTest.cs
mcs/class/corlib/Test/System/GCTest.cs
mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs
mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs
mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs
mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs
mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs
mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs
mcs/class/referencesource/System.Data/System/Data/CodeGen/StrongTypingException.cs
mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs
mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs
mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs
mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs
mcs/class/referencesource/System/compmod/system/collections/generic/stack.cs
mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs
mcs/mcs/class.cs
mcs/mcs/codegen.cs
mcs/mcs/ecore.cs
mcs/mcs/expression.cs
mcs/mcs/generic.cs
mcs/mcs/membercache.cs
mcs/mcs/method.cs
mcs/mcs/nullable.cs
mcs/mcs/statement.cs
mcs/tests/dtest-003.cs
mcs/tests/dtest-008.cs
mcs/tests/dtest-033.cs
mcs/tests/dtest-error-01.cs
mcs/tests/dtest-error-02.cs
mcs/tests/dtest-error-03.cs
mcs/tests/dtest-error-04.cs
mcs/tests/gtest-644.cs [new file with mode: 0644]
mcs/tests/gtest-645-lib.cs [new file with mode: 0644]
mcs/tests/gtest-645.cs [new file with mode: 0644]
mcs/tests/test-anon-178.cs [new file with mode: 0644]
mcs/tests/test-async-90.cs [new file with mode: 0644]
mcs/tests/test-async-91.cs [new file with mode: 0644]
mcs/tests/test-null-operator-24.cs [new file with mode: 0644]
mcs/tests/ver-il-net_4_x.xml
mcs/tools/cil-stringreplacer/Makefile
mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
mcs/tools/linker/Descriptors/mscorlib.xml
mcs/tools/mono-symbolicate/mono-symbolicate-net_4_x.csproj
mcs/tools/mono-symbolicate/mono-symbolicate.exe.sources
mcs/tools/xbuild/Main.cs
mono/metadata/gc-internals.h
mono/metadata/gc.c
mono/metadata/icall.c
mono/metadata/loader.c
mono/metadata/marshal.c
mono/metadata/marshal.h
mono/metadata/runtime.c
mono/metadata/threadpool-io.c
mono/metadata/threadpool-worker-default.c
mono/metadata/threadpool-worker.h
mono/metadata/threadpool.c
mono/metadata/threads.c
mono/metadata/verify.c
mono/metadata/w32error.h
mono/metadata/w32file-unix.c
mono/metadata/w32process-unix.c
mono/metadata/w32socket-unix.c
mono/metadata/w32socket.c
mono/mini/Makefile.am.in
mono/mini/aot-compiler.c
mono/mini/aot-runtime.c
mono/mini/driver.c
mono/mini/generics-interp.cs [deleted file]
mono/mini/generics.cs
mono/mini/graph.c
mono/mini/gshared.cs
mono/mini/interpreter/interp-internals.h [new file with mode: 0644]
mono/mini/interpreter/interp.c
mono/mini/interpreter/interp.h
mono/mini/interpreter/mintops.def
mono/mini/interpreter/transform.c
mono/mini/method-to-ir.c
mono/mini/mini-arm.c
mono/mini/mini-arm.h
mono/mini/mini-llvm.c
mono/mini/mini-runtime.c
mono/mini/mini.h
mono/mini/objects.cs
mono/mini/tramp-amd64.c
mono/sgen/sgen-workers.c
mono/tests/Makefile.am
mono/tests/unhandled-exception-8.cs [new file with mode: 0644]
mono/tests/verifier/make_tests.sh
mono/utils/checked-build.c
mono/utils/checked-build.h
mono/utils/mono-context.h
mono/utils/mono-lazy-init.h
mono/utils/mono-poll.c
mono/utils/monobitset.c
msvc/scripts/order.xml
po/mcs/.gitattributes [new file with mode: 0644]
po/mcs/LINGUAS
runtime/.gitattributes [new file with mode: 0644]
scripts/.gitattributes
scripts/ci/run-jenkins.sh

index f1689375385d253a1c413d2b07a8e9200e36e684..25a58f158fc10969d96a07b31634e05431143a84 100644 (file)
@@ -4,6 +4,9 @@ config.rpath    crlf=input
 configure.host crlf=input
 mkinstalldirs  crlf=input
 *.sh   crlf=input
+*.sources      crlf=input
+.gitattributes crlf=input
+*akefile*      crlf=input
 
 # ensure native line endings on checkout
 *.c    crlf
@@ -11,10 +14,6 @@ mkinstalldirs        crlf=input
 *.cs   crlf
 *.il   crlf
 
-.gitattributes crlf
-*akefile*      crlf
-*.sources      crlf
-
 # don't do anything to line-endings.  Let CRLFs go into the repo, and CRLF on checkout
 *.bat          -crlf
 *.sln          -crlf
index 4778f68234bfca3a8e1df3884fe0de2cb118f37b..387b6d297ba5a3c1834e439291b5bf1276538ea0 100644 (file)
@@ -4106,6 +4106,8 @@ if test "x$enable_btls" = "xyes"; then
                BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
                if test "x$with_btls_android_ndk" != "x"; then
                        BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DANDROID_NDK=\"$with_btls_android_ndk\""
+               else
+                       AC_MSG_ERROR([Need to pass the --with-btls-android-ndk argument when building with BTLS support on Android.])
                fi
        fi
 
index 08576f1a7de515eeda783c2936310d8288aa6629..1471ea511817cbed7af16759188a359021cf0ca8 100644 (file)
@@ -86,7 +86,7 @@ LOCK RULES
 Simple locks:
        Can be acquired at any point regardless of which locks are taken or not.
        No other locks can be acquired or released while holding a simple lock.
-       Reentrancy is not recomended. (warning)
+       Reentrancy is not recommended. (warning)
        Simple locks are leaf locks on the lock lattice.
 
 Complex locks:
@@ -129,7 +129,7 @@ ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while
 WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name
 WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache
        Both of those happen when filling up the name_cache, as it needs to alloc image memory.
-       This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly.
+       This one is fixable by splitting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriately.
 
 */
 
diff --git a/docs/.gitattributes b/docs/.gitattributes
new file mode 100644 (file)
index 0000000..1847f86
--- /dev/null
@@ -0,0 +1,3 @@
+check-coverage crlf=input
+check-exports  crlf=input
+produce-lists  crlf=input
index b44089c0de9ac4d5a5269fd91a6a4c8301f9c950..5c2ce91fd5f294e7a96b347bdb5f69200022c2c9 100755 (executable)
@@ -26,7 +26,7 @@ some combination of the two.
        
        To be clearer, and give an idea of what the algorithm can and
        cannot do without describing it in detail... keep in mind that
-       only "redunant" checks cannot be removed. By "redundant", I
+       only "redundant" checks cannot be removed. By "redundant", I
        mean "already explicitly checked" in the method code.
        
        Unfortunately, analyzing complex expressions is not so easy
@@ -136,7 +136,7 @@ some combination of the two.
        In the first case, the BB has exactly two exit BBs, and their
        execution conditions are easy to get from the condition of the
        branch (see the "get_relation_from_branch_instruction"
-       function, and expecially the end of "analyze_block" in
+       function, and especially the end of "analyze_block" in
        abcremoval.c.
 
        If there is a switch, the jump condition of every exit BB is
@@ -303,7 +303,7 @@ some combination of the two.
        each BB tried to examine all possible conditions between all
        variables, filling a sort of "evaluation matrix". The problem
        was that the complexity of this evaluation was quadratic (or
-       worse) on the number of variables, and that many wariables
+       worse) on the number of variables, and that many variables
        were examined even if they were not involved in any array
        access.
        
@@ -332,7 +332,7 @@ some combination of the two.
 
                    [1b] Prepare the evaluation graph (empty)
 
-                   [1b] Summarize each varible definition, and put
+                   [1b] Summarize each variable definition, and put
                         the resulting relations in the evaluation
                         graph
 
index 7d446abd40b5331b5900cc280dfe8c6d1a1eee4c..e8abd2e5568b32bd985befca308016d4526158ed 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7d446abd40b5331b5900cc280dfe8c6d1a1eee4c
+Subproject commit e8abd2e5568b32bd985befca308016d4526158ed
index f7733aca6228f21cb06a0e4ebd58ca973643c4a6..f41352fa7dce0162d3172004617121fe28f06a88 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f7733aca6228f21cb06a0e4ebd58ca973643c4a6
+Subproject commit f41352fa7dce0162d3172004617121fe28f06a88
index 7668f9bab6c688eef882bfd0b74dd5e86a9ddc11..c00dde208d25f180d881c37d465410ed2edd6939 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7668f9bab6c688eef882bfd0b74dd5e86a9ddc11
+Subproject commit c00dde208d25f180d881c37d465410ed2edd6939
index 367864ef810859ae3ce652864233b35f2dd5fdbe..7c1e61bec8c069b2cc9e214c3094b147d76bbf82 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 367864ef810859ae3ce652864233b35f2dd5fdbe
+Subproject commit 7c1e61bec8c069b2cc9e214c3094b147d76bbf82
index ae2f95cb3fe207d911dade789078327631f59aad..5e6ebcfb7a3de6675a593ee8234dff848eed4172 100644 (file)
@@ -21,7 +21,7 @@
  * See the definition of page_hash_table in gc_private.h.
  * False hits from the stack(s) are much more dangerous than false hits
  * from elsewhere, since the former can pin a large object that spans the
- * block, eventhough it does not start on the dangerous block.
+ * block, even though it does not start on the dangerous block.
  */
  
 /*
index fa6f279f518a5fac4b4778e9e869e4d82bb0539c..c30d2fc2184751a5b49d4b1c65c76655d8af6006 100644 (file)
@@ -1872,7 +1872,7 @@ Since 6.2alpha6:
  - Fixed Makefile.direct for DARWIN.  (Thanks to Manuel Serrano.)
  - There was a race between GC_pthread_detach and thread exit that could
    result in a thread structure being deallocated by GC_pthread_detach
-   eventhough it was still needed by the thread exit code.  (Thanks to
+   even though it was still needed by the thread exit code.  (Thanks to
    Dick Porter for the small test case that allowed this to be debugged.)
  - Fixed version parsing for non-alpha versions in acinclude.m4 and
    version checking in version.h.
index df0ef2cda933f68b5f2b37552a000182d38b1a5d..153a3e0f91465424070641164eae24bd5b70ae9b 100644 (file)
@@ -19,7 +19,7 @@ relatively easy to adapt to new compilers with a different set of predefined
 macros.  Currently these macros generally identify platforms instead of
 features.  In many cases, this is a mistake.
 
-3) The code currently avoids #elif, eventhough that would make it more
+3) The code currently avoids #elif, even though that would make it more
 readable.  This was done since #elif would need to be understood by ALL
 compilers used to build the collector, and that hasn't always been the case.
 It makes sense to reconsider this decision at some point, since #elif has been
index e14e5296c59f76d309ed7c7bc0d6c745019cde32..e870342e4121c2b7a92f56813605ef042502ed5f 100644 (file)
@@ -936,7 +936,7 @@ void GC_do_local_mark(mse *local_mark_stack, mse *local_top)
            /* Try to share the load, since the main stack is empty,    */
            /* and helper threads are waiting for a refill.             */
            /* The entries near the bottom of the stack are likely      */
-           /* to require more work.  Thus we return those, eventhough  */
+           /* to require more work.  Thus we return those, even though */
            /* it's harder.                                             */
            mse * p;
            mse * new_bottom = local_mark_stack
index d773851df4520e14cf02764ad48f92b6cf65fb3e..6b9ffd5c2b06f3a6926412396b477fe44c951bec 100644 (file)
@@ -8,7 +8,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH gacutil "Mono 1.0"
+.TH Mono "gacutil"
 .SH NAME
 gacutil \- Global Assembly Cache management utility.
 .SH SYNOPSIS
index f667a8f62a6851c3ffbe8ef0d5672ef2b3771312..795b855fb1cdd447727ce5ae97087105fb256660 100644 (file)
--- a/man/lc.1
+++ b/man/lc.1
@@ -9,7 +9,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH lc "Mono 2.6"
+.TH Mono "lc"
 .SH NAME
 lc \- Mono License Compiler
 .SH SYNOPSIS
index e39b080cce1245f37774efb1517dc6e4657bda6c..34c52691bd6a126c1ef5e883527a6869623a798f 100644 (file)
@@ -8,7 +8,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH macpack "Mono 1.0"
+.TH Mono "macpack"
 .SH NAME
 macpack \- Macintosh OS X Packager for managed gui assemblies
 .SH SYNOPSIS
index 0f809a59c9af5d744d2d163fb09b48fc3732dbae..0e220bc54b634baf1e68b44b26722510a536b718 100644 (file)
@@ -1,8 +1,8 @@
 .\" 
-.\" mono manual page.
+.\" mdb2ppdb manual page.
 .\" Copyright 2017 Microsoft 
 .\"
-.TH Mono "Mono 4.8.0"
+.TH Mono "mdb2ppdb"
 .SH NAME
 mdb2ppdb \- Convert Mono's debug file format (MDB) to Portable Program
 Database (PPDB) file formatn
index 440fc15a39793c8747007e4fb31ec825cfcd5c0a..3cd4bbea5558369f244d1873b7f220ec20c73074 100644 (file)
@@ -765,7 +765,7 @@ Refers to a namespace, e.g. \fIN:System\fR.
 .I "P:"
 Refers to a property.  If the property is an indexer or takes parameters, 
 the parameter types are appended to the property name and enclosed with
-paranthesis:
+parenthesis:
 \fIP:System.String.Length\fR,
 \fIP:System.String.Chars(System.Int32)\fR.
 .TP
index 3d067eb27ef9892b7d979a57b40f1d4fa17c4814..8a738a56f8384e332e678ccc94640c1dbf102d19 100644 (file)
@@ -8,7 +8,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH mkbundle "mkbundle 1.0"
+.TH Mono "mkbundle"
 .SH NAME
 mkbundle, mkbundle2 \- Creates a bundled executable.
 .SH SYNOPSIS
index 94c7b1665bc5a2fd21a17ba52b84d82136a33f1d..a8e31f3ed3356515a970d082eb42bb5537a13e2f 100644 (file)
@@ -5,7 +5,7 @@
 .\"   Miguel de Icaza (miguel@gnu.org)
 .\"   Paolo Molaro (lupus@ximian.com)
 .\"
-.TH Mono "Mono 1.0"
+.TH Mono "mono-config"
 .SH NAME
 mono-config \- Mono runtime file format configuration
 .SH DESCRIPTION
index 419289cabe5061007149b48f2163330503d2e53e..8a1a99caf1c93823c2521b1c026e7d46d89153f8 100644 (file)
@@ -8,7 +8,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH Mono "Mono 1.0"
+.TH Mono "mono-service"
 .SH NAME
 mono-service, mono-service2 \- Mono ServiceProcess host
 .SH SYNOPSIS
index 13c4928c929d5c17f51df184c463c70cad2052a9..e0c897d260dccc666581fd22670e671ec87ede2b 100644 (file)
@@ -9,7 +9,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH mono-xmltool "Mono 1.0"
+.TH Mono "mono-xmltool"
 .SH NAME
 mono-xmltool \- Mono XML validation and transformation tool. 
 .SH SYNOPSIS
index 946f7afd8b025eeae5b3f95a0492c683a7847ce0..4c99a8dd0d8ffe38e12cbaf81b7a5710da13c1f0 100644 (file)
@@ -7,7 +7,7 @@
 .\" Author:
 .\"   Miguel de Icaza (miguel@gnu.org)
 .\"
-.TH Mono "Mono 4.7.0"
+.TH Mono "mono"
 .SH NAME
 mono \- Mono's ECMA-CLI native code generator (Just-in-Time and Ahead-of-Time)
 .SH SYNOPSIS
@@ -609,7 +609,7 @@ Finally, namespaces can be specified using the N: prefix:
 Don't align stack frames on the x86 architecture.  By default, Mono
 aligns stack frames to 16 bytes on x86, so that local floating point
 and SIMD variables can be properly aligned.  This option turns off the
-alignment, which usually saves one intruction per call, but might
+alignment, which usually saves one instruction per call, but might
 result in significantly lower floating point and SIMD performance.
 .TP
 \fB--jitmap\fR
index 19d740305271c612aa69fc4b55dfafeb2a6d06be..8bbc34cb239284d9e71ff9bd8f078fcd93bde9cc 100644 (file)
@@ -237,7 +237,7 @@ to the type name, while methods append the method name (with an optional count
 of the number of generic parameters).
 .Sp
 If the constructor or method take arguments, these are listed within
-paranthesis after the constructor/method name:
+parenthesis after the constructor/method name:
 .Sp
 .I M:System.Object..ctor
 ,
@@ -259,7 +259,7 @@ Refers to a namespace, e.g.
 .I "P:"
 Refers to a property.  If the property is an indexer or takes parameters, 
 the parameter types are appended to the property name and enclosed with
-paranthesis:
+parenthesis:
 .I P:System.String.Length
 ,
 .I P:System.String.Chars(System.Int32)
index d8e9e4a98fe2a14e13c96ac13cdffa4239a8bbe6..1fd112447f8e91bbcd2d5aff11cf894a2baaaede 100644 (file)
@@ -8,7 +8,7 @@
 .if t .sp .5v
 .if n .sp
 ..
-.TH resgen "resgen 1.0"
+.TH Mono "resgen"
 .SH NAME
 resgen, resgen2 \- Mono/CLI Resource Generator
 .SH SYNOPSIS
index 4bf500ffd4a16a81c625ac2829e912449a895def..008fddbfc5c8253582e0ced767c1faf0f6379b55 100644 (file)
@@ -407,7 +407,7 @@ mysql      MySQL AB      MySql.Data.MySqlClient     MySql.Data
 NOTES:
 
 Ngsql is the .Net Data Provider for PosgreSQL.  The
-latest verison can be downloaded from 
+latest version can be downloaded from
 http://npgsql.projects.postgresql.org/
 
 MySql.Data is the MySQL Connector/Net for connecting to MySql databases.
index 1f9c224a2bb3dd4233a2607c98ef814c4e40d5bd..b81912bae54689d5c5ff6d0c2f685748b3bd1b1a 100644 (file)
@@ -1,2 +1,3 @@
 /LICENSE.MSPL -crlf
 /ScalableMonoIcon.svg -crlf
+/winexe.in     crlf=input
index 9d2deb9122f88a1b0759a16c4ba42b6c9272a885..54aa55d1545c99752cfe3e7e1de9bc181fafd8fc 100644 (file)
                                        code ();
                                }
 
-               * Avoid using unecessary open/close braces, vertical space
+               * Avoid using unnecessary open/close braces, vertical space
                  is usually limited:
 
                        good:
@@ -474,4 +474,4 @@ class X : Y {
                 MyHelperClass.cli.cs
                 MyHelperClass.jvm.cs
 
-       By using partial classes.
\ No newline at end of file
+       By using partial classes.
index bdc3b91261ed9f4df4a9e6319270718784f0cec8..a32065f040d6a6febdf5f443e210496b6b5c2f72 100644 (file)
@@ -25,7 +25,6 @@ PROFILE_MCS_FLAGS = \
        -d:MOBILE_DYNAMIC \
        -d:MONODROID \
        -d:ANDROID \
-       -d:NETSTANDARD \
        -nowarn:1699 \
        -nostdlib \
        $(DEFAULT_REFERENCES) \
index 4864a935530316e27aec0fe0ee71814db079e425..67408bbf9ce4416bc9d380518a3925f0002b46d3 100644 (file)
@@ -27,7 +27,6 @@ PROFILE_MCS_FLAGS = \
        -d:DISABLE_REMOTING \
        -d:DISABLE_COM \
        -d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
-       -d:NETSTANDARD \
        -nowarn:1699 \
        -nostdlib \
        $(DEFAULT_REFERENCES) \
index b547209cbaa99d94c4dcd1a15477512ce47b7418..a43693e04b37a3f79ab77743e051bb2f213c880a 100644 (file)
@@ -21,7 +21,6 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_0 \
        -d:NET_4_5 \
        -d:MONO \
-       -d:NETSTANDARD \
        -d:MOBILE,MOBILE_LEGACY \
        -d:FULL_AOT_DESKTOP     \
        -d:FULL_AOT_RUNTIME \
index 400e9df1b9ebba194ac5b8c5fda5e87aecc722ad..b4f51ca390401856a688861e33f4a94c855aaf7f 100644 (file)
@@ -21,7 +21,6 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_0 \
        -d:NET_4_5 \
        -d:MONO \
-       -d:NETSTANDARD \
        -d:MOBILE,MOBILE_LEGACY \
        -d:FULL_AOT_DESKTOP     \
        -d:FULL_AOT_RUNTIME \
index fcb655ecd417b34ff768cee0ad42134af9ecbdfe..2233519ac488276f553ded180e907d2587f181bf 100644 (file)
@@ -23,7 +23,6 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_0 \
        -d:NET_4_5 \
        -d:MONO \
-       -d:NETSTANDARD \
        -nowarn:1699 \
        -nostdlib \
        $(DEFAULT_REFERENCES) \
index 0380237c6cded3d70f54988eb6150fcadf2c2fac..a332d23266bad0571f424aafc774d32c849eac02 100644 (file)
@@ -21,7 +21,6 @@ PROFILE_MCS_FLAGS = \
        -d:NET_4_0 \
        -d:NET_4_5 \
        -d:MONO \
-       -d:NETSTANDARD \
        -d:MOBILE,MOBILE_LEGACY \
        -d:FULL_AOT_DESKTOP     \
        -d:FULL_AOT_RUNTIME \
index 6e84ebbb91c62eef28818e7d06158f4ad5fe7a9e..97265214662c26d192f71636e4ba90cfee19005f 100644 (file)
@@ -24,7 +24,6 @@ PROFILE_MCS_FLAGS = \
        -d:XAMMAC \
        -d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
        -d:XAMARIN_MODERN \
-       -d:NETSTANDARD \
        -nowarn:1699 \
        -nostdlib \
        $(DEFAULT_REFERENCES) \
index 796e72236d6e1f66851f3f10721040c8a9c16338..ff651e4843eda2db78eb6399e7ef8161675967dd 100644 (file)
@@ -55,9 +55,7 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbColumn.cs" />\r
     <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataReaderExtensions.Facade.cs" />\r
-    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IColumnMappingCollection.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
index 883b2970bad4a9bbf3cb925a137eff367416719c..32b5e3dcfa2f0875712eb9f916c75f2cf80c3a09 100644 (file)
@@ -1,6 +1,4 @@
 TypeForwarders.cs
 AssemblyInfo.cs
 
-../../../../external/corefx/src/System.Data.Common/src/System/Data/IColumnMappingCollection.cs
-../../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbColumn.cs
 ../../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReaderExtensions.Facade.cs
index 9470c9c78b2ca156ac4782396c30c7b48217b5ca..de99a9d6184e48a3c2ca79edee724a90ba118b69 100644 (file)
@@ -23,6 +23,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DBNull))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandBehavior))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbColumn))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommand))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnection))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnectionStringBuilder))]
@@ -38,6 +39,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowVersion))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTable))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DbType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMappingCollection))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameter))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameterCollection))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataReader))]
index 2e4028199f1e1cd52121eef23153f59452851a6c..fb688bfe397d66882a23b24462255348b4aba927 100644 (file)
@@ -25,6 +25,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventChannel))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommand))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommandEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCounter))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventDataAttribute))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventFieldAttribute))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventFieldFormat))]
@@ -44,7 +45,3 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventTask))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.NonEventAttribute))]
-
-#if NETSTANDARD
-[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCounter))]
-#endif
index 27258a0831aaea109cbb2b1420fa396ee1cc6147..7fd2f2898cdbcfd89116ffd99c280713c1d756c5 100644 (file)
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketInformationOptions))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketOptionLevel))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketOptionName))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveFromResult))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveMessageFromResult))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketShutdown))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketTaskExtensions))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketType))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TcpClient))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TcpListener))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TransmitFileOptions))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpClient))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpReceiveResult))]
-
-#if NETSTANDARD
-[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveFromResult))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveMessageFromResult))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketTaskExtensions))]
-#endif
index 82ffbd5e0f9a28287ca5facf3600970337a59d56..7ad170e1e51367c76e10a8309cb57fdb6a129437 100644 (file)
@@ -11,9 +11,11 @@ LIBRARY = netstandard.dll
 
 KEY_FILE = ../../msfinal.pub
 SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 /nowarn:618
-LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Net.Http System.Transactions \
+LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \
 System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem \
-Facades/System.Security.Cryptography.Algorithms
+Facades/System.Security.Cryptography.Algorithms Facades/System.Globalization.Extensions Facades/System.Data.Common \
+Facades/System.Diagnostics.StackTrace Facades/System.Runtime.Serialization.Xml Facades/System.Runtime.Serialization.Primitives \
+Facades/System.Security.SecureString Facades/System.Threading.Overlapped Facades/System.Xml.XPath.XDocument
 
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_REFS += System.Web.Services
index a7ed8bb8144765e5fd884cedcf5491781ac03cf1..fa9e99d722dfc86189a2cfa2bda0c2a669044e98 100644 (file)
@@ -2,6 +2,12 @@ thisdir = class
 
 pcl_facade_dirs := Facades
 
+-include ../build/config.make
+
+ifdef MCS_MODE
+MCS_MODE_dirs := Mono.Cecil.Mdb
+endif
+
 # The minimal set of csc dependencies
 basic_SUBDIRS := \
        corlib \
@@ -14,6 +20,7 @@ basic_SUBDIRS := \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
        Mono.Cecil \
+       $(MCS_MODE_dirs) \
        ../tools/cil-stringreplacer
 
 # resgen is corlib specific so we need to wait until corlib is build
@@ -33,12 +40,11 @@ build_SUBDIRS :=  \
        System.Runtime.InteropServices.RuntimeInformation \
        System.IO.Compression \
        Mono.Cecil \
+       $(MCS_MODE_dirs) \
        Mono.CompilerServices.SymbolWriter      \
        PEAPI \
        ../tools/cil-stringreplacer
 
--include ../build/config.make
-
 ifdef MCS_MODE
 basic_PARALLEL_SUBDIRS := ../mcs
 build_PARALLEL_SUBDIRS := ../mcs
index ae919ca94fb481c00652d29fbe67de1180ee268a..e22eae3e178f473dd09bb49d491bd12578c5a9d0 100644 (file)
@@ -4,8 +4,10 @@ include ../../build/rules.make
 
 LIBRARY = Microsoft.CSharp.dll
 
-LIB_REFS = System.Core Mono.CSharp
+LIB_REFS = System.Core System
 LIB_MCS_FLAGS =
 
+RESX_RESOURCE_STRING = ../../../external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx
+
 include ../../build/library.make
 
index 41574527162ac270c67acea1781f1f890a86995a..e764b1041be993c46e568bc00db84e8e3859eae4 100644 (file)
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Binder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\BinderHelper.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpArgumentInfo.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpArgumentInfoFlags.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpBinaryOperationBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpBinaryOperationFlags.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpBinderFlags.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpCallFlags.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpConversionKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpConvertBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpGetIndexBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpGetMemberBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpInvokeBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpInvokeConstructorBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpInvokeMemberBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpIsEventBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpSetIndexBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpSetMemberBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\CSharpUnaryOperationBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Error.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\CController.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\CError.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\CErrorFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\CParameterizedError.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\ErrorCode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\ErrorFacts.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\ErrorFmt.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\ErrorHandling.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\IErrorSink.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\MessageID.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Errors\UserStringBuilder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ExpressionTreeCallRewriter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ICSharpInvokeOrInvokeMemberBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ResetBindException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderController.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderExtensions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderInternalCompilerException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Binding\Better.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Binding\ErrorReporting.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingContextBase.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingContexts.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingFlag.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpArgInfo.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpSig.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\CandidateFunctionMember.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ConstVal.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ConstValFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversion.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\AggregateDeclaration.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\Declaration.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\GlobalAttributeDeclaration.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\NamespaceDeclaration.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExplicitConversion.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRExtensions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExprFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRFLAG.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\FileRecord.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\FundamentalTypes.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\GlobalSymbolContext.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\GroupToArgsBinder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\GroupToArgsBinderResult.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ImplicitConversion.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\InputFile.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ITypeOrNamespace.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\LangCompiler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MemberLookup.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MemberLookupResults.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MetadataToken.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MethodIterator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MethodKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\MethodTypeInferrer.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\NameGenerator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Nullable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\NullableLift.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Operators.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\OriginalExpressions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\PredefinedAttributes.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\PredefinedMembers.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SemanticChecker.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SubstitutionContext.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AggregateSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AssemblyQualifiedNamespaceSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LabelSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LocalVariableSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodOrPropertySymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MiscSymFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\NamespaceOrAggregateSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\NamespaceSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\ParentSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\PropertySymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\Scope.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\Symbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolLoader.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolManagerBase.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolMask.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactoryBase.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TransparentIdentifierMemberSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TypeParameterSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\UnresolvedAggregateSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\VariableSymbol.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayIndex.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayInitialization.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayLength.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Assignment.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BinaryOperator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Block.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BoundAnonymousFunction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Call.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Cast.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Class.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\CompoundOperator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Concatenate.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ConditionalOperator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Constant.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Event.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExpressionIterator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Field.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\FieldInfo.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\HoistedLocal.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\List.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\LocalVariable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\MemberGroup.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\MethodInfo.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\MethodReference.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\NamedArgumentSpecification.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Property.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\PropertyInfo.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Return.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Statement.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Temporary.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\This.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\TypeArguments.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\TypeOf.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\TypeOrNamespace.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UnaryOperator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UnboundAnonymousFunction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UserDefinedConversion.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UserDefinedLogicalOperator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Visitors\ExpressionTreeRewriter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Visitors\ExprVisitorBase.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ZeroInitialize.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\TypeBind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\AggregateType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArgumentListType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArrayType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\BoundLambdaType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ErrorType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\MethodGroupType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullableType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\OpenTypePlaceholderType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ParameterModifierType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\PointerType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\PredefinedTypes.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\Type.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeArray.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeFactory.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeKind.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeManager.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeParameterType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\VoidType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\UnaOpSig.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\UtilityTypeExtensions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\WithType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\SpecialNames.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\SymbolTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\KnownName.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\NameManager.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\Names.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\NameTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\Operators.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\PredefinedName.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\PredefinedType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\TokenFacts.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\TokenKind.cs" />\r
+    <Compile Include="..\..\build\common\Consts.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Binder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfoFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinderFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpConvertBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeConstructorBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpIsEventBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpUnaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\DynamicContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\ErrorPrinter.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Extensions.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderException.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderInternalCompilerException.cs" />\r  </ItemGroup>\r
+    <Compile Include="corefx\SR.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
       <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>\r
       <Name>System.Core-net_4_x</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="../Mono.CSharp/Mono.CSharp-net_4_x.csproj">\r
-      <Project>{BEFCA993-98B4-48E9-8D68-1ACCB1FA7200}</Project>\r
-      <Name>Mono.CSharp-net_4_x</Name>\r
+    <ProjectReference Include="../System/System-net_4_x.csproj">\r
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
+      <Name>System-net_4_x</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs
deleted file mode 100644 (file)
index c8d5687..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Binder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       public static class Binder
-       {
-               public static CallSiteBinder BinaryOperation (CSharpBinderFlags flags, ExpressionType operation, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpBinaryOperationBinder (operation, flags, context, argumentInfo);
-               }
-               
-               public static CallSiteBinder Convert (CSharpBinderFlags flags, Type type, Type context)
-               {
-                       return new CSharpConvertBinder (type, context, flags);
-               }
-               
-               public static CallSiteBinder GetIndex (CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpGetIndexBinder (context, argumentInfo);
-               }
-               
-               public static CallSiteBinder GetMember (CSharpBinderFlags flags, string name, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpGetMemberBinder (name, context, argumentInfo);
-               }
-               
-               public static CallSiteBinder Invoke (CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpInvokeBinder (flags, context, argumentInfo);
-               }
-               
-               public static CallSiteBinder InvokeConstructor (CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       // What are flags for here
-                       return new CSharpInvokeConstructorBinder (context, argumentInfo);
-               }
-               
-               public static CallSiteBinder InvokeMember (CSharpBinderFlags flags, string name, IEnumerable<Type> typeArguments, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpInvokeMemberBinder (flags, name, context, typeArguments, argumentInfo);
-               }
-               
-               public static CallSiteBinder IsEvent (CSharpBinderFlags flags, string name, Type context)
-               {
-                       return new CSharpIsEventBinder (name, context);
-               }
-               
-               public static CallSiteBinder SetIndex (CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpSetIndexBinder (flags, context, argumentInfo);
-               }
-               
-               public static CallSiteBinder SetMember (CSharpBinderFlags flags, string name, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpSetMemberBinder (flags, name, context, argumentInfo);
-               }
-               
-               public static CallSiteBinder UnaryOperation (CSharpBinderFlags flags, ExpressionType operation, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       return new CSharpUnaryOperationBinder (operation, flags, context, argumentInfo);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs
deleted file mode 100644 (file)
index 2c54af2..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// CSharpArgumentInfo.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       public sealed class CSharpArgumentInfo
-       {
-               readonly CSharpArgumentInfoFlags flags;
-               readonly string name;
-               
-               CSharpArgumentInfo (CSharpArgumentInfoFlags flags, string name)
-               {
-                       this.flags = flags;
-                       this.name = name;
-               }
-               
-               public static CSharpArgumentInfo Create (CSharpArgumentInfoFlags flags, string name)
-               {
-                       return new CSharpArgumentInfo (flags, name);
-               }
-
-               internal Compiler.Argument.AType ArgumentModifier {
-                       get {
-                               if ((flags & CSharpArgumentInfoFlags.IsRef) != 0)
-                                       return Compiler.Argument.AType.Ref;
-
-                               if ((flags & CSharpArgumentInfoFlags.IsOut) != 0)
-                                       return Compiler.Argument.AType.Out;
-
-                               return Compiler.Argument.AType.None;
-                       }
-               }
-
-               internal static CallInfo CreateCallInfo (IEnumerable<CSharpArgumentInfo> argumentInfo, int skipCount)
-               {
-                       var named = from arg in argumentInfo.Skip (skipCount) where arg.IsNamed select arg.name;
-                       return new CallInfo (Math.Max (0, argumentInfo.Count () - skipCount), named);
-               }
-               
-               internal CSharpArgumentInfoFlags Flags {
-                       get { return flags; }
-               }
-
-               internal bool IsNamed {
-                       get { return (flags & CSharpArgumentInfoFlags.NamedArgument) != 0; }
-               }
-
-               internal string Name {
-                       get { return name; }
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs
deleted file mode 100644 (file)
index 9a9ea7e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// CSharpArgumentInfoFlags.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       [Flags]
-       public enum CSharpArgumentInfoFlags
-       {
-               None                            = 0,
-               UseCompileTimeType      = 1,
-               Constant                        = 2,
-               NamedArgument           = 4,
-               IsRef                           = 8,
-               IsOut                           = 16,
-               IsStaticType            = 32
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs
deleted file mode 100644 (file)
index 374eb0d..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// CSharpBinaryOperationBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpBinaryOperationBinder : BinaryOperationBinder
-       {
-               IList<CSharpArgumentInfo> argumentInfo;
-               readonly CSharpBinderFlags flags;
-               readonly Type context;
-               
-               public CSharpBinaryOperationBinder (ExpressionType operation, CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (operation)
-               {
-                       this.argumentInfo = new ReadOnlyCollectionBuilder<CSharpArgumentInfo> (argumentInfo);
-                       if (this.argumentInfo.Count != 2)
-                               throw new ArgumentException ("Binary operation requires 2 arguments");
-
-                       this.flags = flags;
-                       this.context = context;
-               }
-
-               Compiler.Binary.Operator GetOperator (out bool isCompound)
-               {
-                       isCompound = false;
-                       switch (Operation) {
-                       case ExpressionType.Add:
-                               return Compiler.Binary.Operator.Addition;
-                       case ExpressionType.AddAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.Addition;
-                       case ExpressionType.And:
-                               return (flags & CSharpBinderFlags.BinaryOperationLogical) != 0 ?
-                                       Compiler.Binary.Operator.LogicalAnd : Compiler.Binary.Operator.BitwiseAnd;
-                       case ExpressionType.AndAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.BitwiseAnd;
-                       case ExpressionType.Divide:
-                               return Compiler.Binary.Operator.Division;
-                       case ExpressionType.DivideAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.Division;
-                       case ExpressionType.Equal:
-                               return Compiler.Binary.Operator.Equality;
-                       case ExpressionType.ExclusiveOr:
-                               return Compiler.Binary.Operator.ExclusiveOr;
-                       case ExpressionType.ExclusiveOrAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.ExclusiveOr;
-                       case ExpressionType.GreaterThan:
-                               return Compiler.Binary.Operator.GreaterThan;
-                       case ExpressionType.GreaterThanOrEqual:
-                               return Compiler.Binary.Operator.GreaterThanOrEqual;
-                       case ExpressionType.LeftShift:
-                               return Compiler.Binary.Operator.LeftShift;
-                       case ExpressionType.LeftShiftAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.LeftShift;
-                       case ExpressionType.LessThan:
-                               return Compiler.Binary.Operator.LessThan;
-                       case ExpressionType.LessThanOrEqual:
-                               return Compiler.Binary.Operator.LessThanOrEqual;
-                       case ExpressionType.Modulo:
-                               return Compiler.Binary.Operator.Modulus;
-                       case ExpressionType.ModuloAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.Modulus;
-                       case ExpressionType.Multiply:
-                               return Compiler.Binary.Operator.Multiply;
-                       case ExpressionType.MultiplyAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.Multiply;
-                       case ExpressionType.NotEqual:
-                               return Compiler.Binary.Operator.Inequality;
-                       case ExpressionType.Or:
-                               return (flags & CSharpBinderFlags.BinaryOperationLogical) != 0 ?
-                                       Compiler.Binary.Operator.LogicalOr : Compiler.Binary.Operator.BitwiseOr;
-                       case ExpressionType.OrAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.BitwiseOr;
-                       case ExpressionType.OrElse:
-                               return Compiler.Binary.Operator.LogicalOr;
-                       case ExpressionType.RightShift:
-                               return Compiler.Binary.Operator.RightShift;
-                       case ExpressionType.RightShiftAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.RightShift;
-                       case ExpressionType.Subtract:
-                               return Compiler.Binary.Operator.Subtraction;
-                       case ExpressionType.SubtractAssign:
-                               isCompound = true;
-                               return Compiler.Binary.Operator.Subtraction;
-                       default:
-                               throw new NotImplementedException (Operation.ToString ());
-                       }
-               }
-               
-               public override DynamicMetaObject FallbackBinaryOperation (DynamicMetaObject target, DynamicMetaObject arg, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var left = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       var right = ctx.CreateCompilerExpression (argumentInfo [1], arg);
-                       
-                       bool is_compound;
-                       var oper = GetOperator (out is_compound);
-                       Compiler.Expression expr;
-
-                       if (is_compound) {
-                               var target_expr = new Compiler.RuntimeValueExpression (target, ctx.ImportType (target.LimitType));
-                               expr = new Compiler.CompoundAssign (oper, target_expr, right, left);
-                       } else {
-                               expr = new Compiler.Binary (oper, left, right);
-                       }
-
-                       expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-                       
-                       if ((flags & CSharpBinderFlags.CheckedContext) != 0)
-                               expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (arg);
-
-                       return binder.Bind (ctx, context);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs
deleted file mode 100644 (file)
index ab977fc..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// CSharpBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Linq.Expressions;
-using Compiler = Mono.CSharp;
-using System.Reflection;
-using System.Collections.Generic;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpBinder
-       {
-               static ConstructorInfo binder_exception_ctor;
-               static object resolver = new object ();
-
-               DynamicMetaObjectBinder binder;
-               Compiler.Expression expr;
-               BindingRestrictions restrictions;
-               DynamicMetaObject errorSuggestion;
-
-               public CSharpBinder (DynamicMetaObjectBinder binder, Compiler.Expression expr, DynamicMetaObject errorSuggestion)
-               {
-                       this.binder = binder;
-                       this.expr = expr;
-                       this.restrictions = BindingRestrictions.Empty;
-                       this.errorSuggestion = errorSuggestion;
-               }
-
-               public Compiler.ResolveContext.Options ResolveOptions { get; set; }
-
-               public void AddRestrictions (DynamicMetaObject arg)
-               {
-                       restrictions = restrictions.Merge (CreateRestrictionsOnTarget (arg));
-               }
-
-               public void AddRestrictions (DynamicMetaObject[] args)
-               {
-                       restrictions = restrictions.Merge (CreateRestrictionsOnTarget (args));
-               }
-
-               public DynamicMetaObject Bind (DynamicContext ctx, Type callingType)
-               {
-                       Expression res;
-                       try {
-                               var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, callingType), ResolveOptions);
-
-                               // Static typemanager and internal caches are not thread-safe
-                               lock (resolver) {
-                                       expr = expr.Resolve (rc, Compiler.ResolveFlags.VariableOrValue);
-                               }
-
-                               if (expr == null)
-                                       throw new RuntimeBinderInternalCompilerException ("Expression resolved to null");
-
-                               res = expr.MakeExpression (new Compiler.BuilderContext ());
-                       } catch (RuntimeBinderException e) {
-                               if (errorSuggestion != null)
-                                       return errorSuggestion;
-
-                               res = CreateBinderException (e.Message);
-                       } catch (Exception) {
-                               if (errorSuggestion != null)
-                                       return errorSuggestion;
-
-                               throw;
-                       }
-
-                       return new DynamicMetaObject (res, restrictions);
-               }
-
-               Expression CreateBinderException (string message)
-               {
-                       if (binder_exception_ctor == null)
-                               binder_exception_ctor = typeof (RuntimeBinderException).GetConstructor (new[] { typeof (string) });
-
-                       //
-                       // Uses target type to keep expressions composition working
-                       //
-                       return Expression.Throw (Expression.New (binder_exception_ctor, Expression.Constant (message)), binder.ReturnType);
-               }
-
-               static BindingRestrictions CreateRestrictionsOnTarget (DynamicMetaObject arg)
-               {
-                       return arg.HasValue && arg.Value == null ?
-                               BindingRestrictions.GetInstanceRestriction (arg.Expression, null) :
-                               BindingRestrictions.GetTypeRestriction (arg.Expression, arg.LimitType);
-               }
-
-               public static BindingRestrictions CreateRestrictionsOnTarget (DynamicMetaObject[] args)
-               {
-                       if (args.Length == 0)
-                               return BindingRestrictions.Empty;
-
-                       var res = CreateRestrictionsOnTarget (args[0]);
-                       for (int i = 1; i < args.Length; ++i)
-                               res = res.Merge (CreateRestrictionsOnTarget (args[i]));
-
-                       return res;
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs
deleted file mode 100644 (file)
index 39ef679..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// CSharpBinderFlags.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       [Flags]
-       public enum CSharpBinderFlags
-       {
-               None                                    = 0,
-               CheckedContext                  = 1,
-               InvokeSimpleName                = 1 << 1,
-               InvokeSpecialName               = 1 << 2,
-               BinaryOperationLogical  = 1 << 3,
-               ConvertExplicit                 = 1 << 4,
-               ConvertArrayIndex               = 1 << 5,
-               ResultIndexed                   = 1 << 6,               
-               ValueFromCompoundAssignment = 1 << 7,
-               ResultDiscarded                 = 1 << 8
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs
deleted file mode 100644 (file)
index 32fa472..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// CSharpConvertBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpConvertBinder : ConvertBinder
-       {
-               readonly CSharpBinderFlags flags;
-               readonly Type context;
-
-               public CSharpConvertBinder (Type type, Type context, CSharpBinderFlags flags)
-                       : base (type, (flags & CSharpBinderFlags.ConvertExplicit) != 0)
-               {
-                       this.flags = flags;
-                       this.context = context;
-               }
-
-               public override DynamicMetaObject FallbackConvert (DynamicMetaObject target, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var expr = ctx.CreateCompilerExpression (null, target);
-
-                       if (Explicit)
-                               expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (Type), Compiler.Location.Null), expr, Compiler.Location.Null);
-                       else
-                               expr = new Compiler.ImplicitCast (expr, ctx.ImportType (Type), (flags & CSharpBinderFlags.ConvertArrayIndex) != 0);
-
-                       if ((flags & CSharpBinderFlags.CheckedContext) != 0)
-                               expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-
-                       return binder.Bind (ctx, context);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs
deleted file mode 100644 (file)
index 367cc22..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// CSharpGetIndexBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpGetIndexBinder : GetIndexBinder
-       {
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-               
-               public CSharpGetIndexBinder (Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1))
-               {
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-                       
-               public override DynamicMetaObject FallbackGetIndex (DynamicMetaObject target, DynamicMetaObject[] indexes, DynamicMetaObject errorSuggestion)
-               {
-                       if (argumentInfo.Count != indexes.Length + 1) {
-                               if (errorSuggestion == null)
-                                       throw new NotImplementedException ();
-
-                               return errorSuggestion;
-                       }
-
-                       var ctx = DynamicContext.Create ();
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       var args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), indexes);
-                       expr = new Compiler.ElementAccess (expr, args, Compiler.Location.Null);
-                       expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (indexes);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs
deleted file mode 100644 (file)
index 790ed72..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// CSharpGetMemberBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpGetMemberBinder : GetMemberBinder
-       {
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-               
-               public CSharpGetMemberBinder (string name, Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (name, false)
-               {
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-               
-               public override DynamicMetaObject FallbackGetMember (DynamicMetaObject target, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       expr = new Compiler.MemberAccess (expr, Name);
-                       expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs
deleted file mode 100644 (file)
index 1f6b34a..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// CSharpInvokeBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpInvokeBinder : InvokeBinder
-       {
-               readonly CSharpBinderFlags flags;
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-               
-               public CSharpInvokeBinder (CSharpBinderFlags flags, Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1))
-               {
-                       this.flags = flags;
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-               
-               public override DynamicMetaObject FallbackInvoke (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args);
-                       expr = new Compiler.Invocation (expr, c_args);
-
-                       if ((flags & CSharpBinderFlags.ResultDiscarded) == 0)
-                               expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-                       else
-                               expr = new Compiler.DynamicResultCast (ctx.ImportType (ReturnType), expr);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (args);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs
deleted file mode 100644 (file)
index b5f0b9f..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// CSharpInvokeConstructorBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpInvokeConstructorBinder : DynamicMetaObjectBinder
-       {
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-               Type target_return_type;
-
-               public CSharpInvokeConstructorBinder (Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-               {
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-
-               public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args)
-               {
-                       var ctx = DynamicContext.Create ();
-
-                       var type = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       target_return_type = type.Type.GetMetaInfo ();
-
-                       var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args);
-
-                       var binder = new CSharpBinder (
-                               this, new Compiler.New (type, c_args, Compiler.Location.Null), null);
-
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (args);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-
-               public override Type ReturnType {
-                       get {
-                               return target_return_type;
-                       }
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs
deleted file mode 100644 (file)
index 138e314..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// CSharpInvokeMemberBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-using SLE = System.Linq.Expressions;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpInvokeMemberBinder : InvokeMemberBinder
-       {
-               //
-               // A custom runtime invocation is needed to deal with member invocation which
-               // is not real member invocation but invocation on invocalble member.
-               //
-               // An example:
-               // class C {
-               //              dynamic f;
-               //              void Foo ()
-               //              {
-               //                      dynamic d = new C ();
-               //                      d.f.M ();
-               //              }
-               //
-               // The runtime value of `f' can be a delegate in which case we are invoking result
-               // of member invocation, this is already handled by DoResolveDynamic but we need
-               // more runtime dependencies which require Microsoft.CSharp assembly reference or
-               // a lot of reflection calls
-               //
-               class Invocation : Compiler.Invocation
-               {
-                       sealed class RuntimeDynamicInvocation : Compiler.ShimExpression
-                       {
-                               Invocation invoke;
-
-                               public RuntimeDynamicInvocation (Invocation invoke, Compiler.Expression memberExpr)
-                                       : base (memberExpr)
-                               {
-                                       this.invoke = invoke;
-                               }
-
-                               protected override Compiler.Expression DoResolve (Compiler.ResolveContext rc)
-                               {
-                                       type = expr.Type;
-                                       eclass = Compiler.ExprClass.Value;
-                                       return this;
-                               }
-
-                               //
-                               // Creates an invoke call on invocable expression
-                               //
-                               public override System.Linq.Expressions.Expression MakeExpression (Compiler.BuilderContext ctx)
-                               {
-                                       var invokeBinder = invoke.invokeBinder;
-                                       var binder = Binder.Invoke (invokeBinder.flags, invokeBinder.callingContext, invokeBinder.argumentInfo);
-
-                                       var args = invoke.Arguments;
-                                       var args_expr = new SLE.Expression[invokeBinder.argumentInfo.Count];
-
-                                       var types = new Type [args_expr.Length + 2];
-
-                                       // Required by MakeDynamic
-                                       types[0] = typeof (System.Runtime.CompilerServices.CallSite);
-                                       types[1] = expr.Type.GetMetaInfo ();
-
-                                       args_expr[0] = expr.MakeExpression (ctx);
-
-                                       for (int i = 0; i < args.Count; ++i) {
-                                               args_expr[i + 1] = args[i].Expr.MakeExpression (ctx);
-
-                                               int type_index = i + 2;
-                                               types[type_index] = args[i].Type.GetMetaInfo ();
-                                               if (args[i].IsByRef)
-                                                       types[type_index] = types[type_index].MakeByRefType ();
-                                       }
-
-                                       // Return type goes last
-                                       bool void_result = (invokeBinder.flags & CSharpBinderFlags.ResultDiscarded) != 0;
-                                       types[types.Length - 1] = void_result ? typeof (void) : invokeBinder.ReturnType;
-
-                                       //
-                                       // Much easier to use Expression.Dynamic cannot be used because it ignores ByRef arguments
-                                       // and it always generates either Func or Action and any value type argument is lost
-                                       //
-                                       Type delegateType = SLE.Expression.GetDelegateType (types);
-                                       return SLE.Expression.MakeDynamic (delegateType, binder, args_expr);
-                               }
-                       }
-
-                       readonly CSharpInvokeMemberBinder invokeBinder;
-
-                       public Invocation (Compiler.Expression expr, Compiler.Arguments arguments, CSharpInvokeMemberBinder invokeBinder)
-                               : base (expr, arguments)
-                       {
-                               this.invokeBinder = invokeBinder;
-                       }
-
-                       protected override Compiler.Expression DoResolveDynamic (Compiler.ResolveContext ec, Compiler.Expression memberExpr)
-                       {
-                               return new RuntimeDynamicInvocation (this, memberExpr).Resolve (ec);
-                       }
-               }
-
-               readonly CSharpBinderFlags flags;
-               IList<CSharpArgumentInfo> argumentInfo;
-               IList<Type> typeArguments;
-               Type callingContext;
-               
-               public CSharpInvokeMemberBinder (CSharpBinderFlags flags, string name, Type callingContext, IEnumerable<Type> typeArguments, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (name, false, CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1))
-               {
-                       this.flags = flags;
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-                       this.typeArguments = typeArguments.ToReadOnly ();
-               }
-               
-               public override DynamicMetaObject FallbackInvoke (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
-               {
-                       var b = new CSharpInvokeBinder (flags, callingContext, argumentInfo);
-                       
-                       // TODO: Is errorSuggestion ever used?
-                       return b.Defer (target, args);
-               }
-               
-               public override DynamicMetaObject FallbackInvokeMember (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args);
-                       var t_args = typeArguments == null ?
-                               null :
-                               new Compiler.TypeArguments (typeArguments.Select (l => new Compiler.TypeExpression (ctx.ImportType (l), Compiler.Location.Null)).ToArray ());
-
-                       var expr = ctx.CreateCompilerExpression (argumentInfo[0], target);
-
-                       //
-                       // Simple name invocation is actually member access invocation
-                       // to capture original this argument. This  brings problem when
-                       // simple name is resolved as a static invocation and member access
-                       // has to be reduced back to simple name without reporting an error
-                       //
-                       if ((flags & CSharpBinderFlags.InvokeSimpleName) != 0) {
-                               var value = expr as Compiler.RuntimeValueExpression;
-                               if (value != null)
-                                       value.IsSuggestionOnly = true;
-                       }
-
-                       expr = new Compiler.MemberAccess (expr, Name, t_args, Compiler.Location.Null);
-                       expr = new Invocation (expr, c_args, this);
-
-                       if ((flags & CSharpBinderFlags.ResultDiscarded) == 0)
-                               expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-                       else
-                               expr = new Compiler.DynamicResultCast (ctx.ImportType (ReturnType), expr);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (args);
-
-                       if ((flags & CSharpBinderFlags.InvokeSpecialName) != 0)
-                               binder.ResolveOptions |= Compiler.ResolveContext.Options.InvokeSpecialName;
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs
deleted file mode 100644 (file)
index e485e40..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// CSharpIsEventBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpIsEventBinder : DynamicMetaObjectBinder
-       {
-               Type callingContext;
-               string name;
-               
-               public CSharpIsEventBinder (string name, Type callingContext)
-               {
-                       this.name = name;
-                       this.callingContext = callingContext;
-               }
-               
-               public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var context_type = ctx.ImportType (callingContext);
-                       var queried_type = ctx.ImportType (target.LimitType);
-                       var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, context_type), 0);
-
-                       var expr = Compiler.Expression.MemberLookup (rc, false, queried_type,
-                               name, 0, Compiler.Expression.MemberLookupRestrictions.ExactArity, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (
-                               this, new Compiler.BoolConstant (ctx.CompilerContext.BuiltinTypes, expr is Compiler.EventExpr, Compiler.Location.Null), null);
-
-                       binder.AddRestrictions (target);
-                       return binder.Bind (ctx, callingContext);
-               }
-
-               public override Type ReturnType {
-                       get {
-                               return typeof (bool);
-                       }
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs
deleted file mode 100644 (file)
index ad2f51a..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// CSharpSetIndexBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpSetIndexBinder : SetIndexBinder
-       {
-               readonly CSharpBinderFlags flags;
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-
-               public CSharpSetIndexBinder (CSharpBinderFlags flags, Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 2))
-               {
-                       this.flags = flags;
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-               
-               public override DynamicMetaObject FallbackSetIndex (DynamicMetaObject target, DynamicMetaObject[] indexes, DynamicMetaObject value, DynamicMetaObject errorSuggestion)
-               {
-                       if (argumentInfo.Count != indexes.Length + 2) {
-                               if (errorSuggestion == null)
-                                       throw new NotImplementedException ();
-
-                               return errorSuggestion;
-                       }
-
-                       var ctx = DynamicContext.Create ();
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-                       var args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), indexes);
-                       expr = new Compiler.ElementAccess (expr, args, Compiler.Location.Null);
-
-                       var source = ctx.CreateCompilerExpression (argumentInfo [indexes.Length + 1], value);
-
-                       // Same conversion as in SetMemberBinder
-                       if ((flags & CSharpBinderFlags.ValueFromCompoundAssignment) != 0) {
-                               expr = new Compiler.RuntimeExplicitAssign (expr, source);
-                       } else {
-                               expr = new Compiler.SimpleAssign (expr, source);
-                       }
-                       expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-
-                       if ((flags & CSharpBinderFlags.CheckedContext) != 0)
-                               expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (value);
-                       binder.AddRestrictions (indexes);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs
deleted file mode 100644 (file)
index aaf2b25..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// CSharpSetMemberBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpSetMemberBinder : SetMemberBinder
-       {
-               readonly CSharpBinderFlags flags;
-               IList<CSharpArgumentInfo> argumentInfo;
-               Type callingContext;
-
-               public CSharpSetMemberBinder (CSharpBinderFlags flags, string name, Type callingContext, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (name, false)
-               {
-                       this.flags = flags;
-                       this.callingContext = callingContext;
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-               }
-               
-               public override DynamicMetaObject FallbackSetMember (DynamicMetaObject target, DynamicMetaObject value, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var source = ctx.CreateCompilerExpression (argumentInfo [1], value);
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-
-                       // Field assignment
-                       expr = new Compiler.MemberAccess (expr, Name);
-
-                       // Compound assignment under dynamic context does not convert result
-                       // expression but when setting member type we need to do explicit
-                       // conversion to ensure type match between member type and dynamic
-                       // expression type
-                       if ((flags & CSharpBinderFlags.ValueFromCompoundAssignment) != 0) {
-                               expr = new Compiler.RuntimeExplicitAssign (expr, source);
-                       } else {
-                               expr = new Compiler.SimpleAssign (expr, source);
-                       }
-
-                       expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-
-                       if ((flags & CSharpBinderFlags.CheckedContext) != 0)
-                               expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null);
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-                       binder.AddRestrictions (value);
-
-                       return binder.Bind (ctx, callingContext);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs
deleted file mode 100644 (file)
index f625f5f..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// CSharpUnaryOperationBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class CSharpUnaryOperationBinder : UnaryOperationBinder
-       {
-               IList<CSharpArgumentInfo> argumentInfo;
-               readonly CSharpBinderFlags flags;
-               readonly Type context;
-               
-               public CSharpUnaryOperationBinder (ExpressionType operation, CSharpBinderFlags flags, Type context, IEnumerable<CSharpArgumentInfo> argumentInfo)
-                       : base (operation)
-               {
-                       this.argumentInfo = argumentInfo.ToReadOnly ();
-                       if (this.argumentInfo.Count != 1)
-                               throw new ArgumentException ("Unary operation requires 1 argument");
-
-                       this.flags = flags;
-                       this.context = context;
-               }
-       
-
-               Compiler.Unary.Operator GetOperator ()
-               {
-                       switch (Operation) {
-                       case ExpressionType.Negate:
-                               return Compiler.Unary.Operator.UnaryNegation;
-                       case ExpressionType.Not:
-                               return Compiler.Unary.Operator.LogicalNot;
-                       case ExpressionType.OnesComplement:
-                               return Compiler.Unary.Operator.OnesComplement;
-                       case ExpressionType.UnaryPlus:
-                               return Compiler.Unary.Operator.UnaryPlus;
-                       default:
-                               throw new NotImplementedException (Operation.ToString ());
-                       }
-               }
-               
-               public override DynamicMetaObject FallbackUnaryOperation (DynamicMetaObject target, DynamicMetaObject errorSuggestion)
-               {
-                       var ctx = DynamicContext.Create ();
-                       var expr = ctx.CreateCompilerExpression (argumentInfo [0], target);
-
-                       if (Operation == ExpressionType.IsTrue) {
-                               expr = new Compiler.BooleanExpression (expr);
-                       } else if (Operation == ExpressionType.IsFalse) {
-                               expr = new Compiler.BooleanExpressionFalse (expr);
-                       } else {
-                               if (Operation == ExpressionType.Increment)
-                                       expr = new Compiler.UnaryMutator (Compiler.UnaryMutator.Mode.PreIncrement, expr, Compiler.Location.Null);
-                               else if (Operation == ExpressionType.Decrement)
-                                       expr = new Compiler.UnaryMutator (Compiler.UnaryMutator.Mode.PreDecrement, expr, Compiler.Location.Null);
-                               else
-                                       expr = new Compiler.Unary (GetOperator (), expr, Compiler.Location.Null);
-
-                               expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null);
-
-                               if ((flags & CSharpBinderFlags.CheckedContext) != 0)
-                                       expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null);
-                       }
-
-                       var binder = new CSharpBinder (this, expr, errorSuggestion);
-                       binder.AddRestrictions (target);
-
-                       return binder.Bind (ctx, context);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs
deleted file mode 100644 (file)
index 9c466c5..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// DynamicContext.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using Compiler = Mono.CSharp;
-using System.Reflection;
-using System.Collections.Generic;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class DynamicContext
-       {
-               static DynamicContext dc;
-               static object compiler_initializer = new object ();
-               static object lock_object = new object ();
-
-               readonly Compiler.ModuleContainer module;
-               readonly Compiler.ReflectionImporter importer;
-
-               private DynamicContext (Compiler.ModuleContainer module, Compiler.ReflectionImporter importer)
-               {
-                       this.module = module;
-                       this.importer = importer;
-               }
-
-               public Compiler.CompilerContext CompilerContext {
-                       get {
-                               return module.Compiler;
-                       }
-               }
-
-               public Compiler.ModuleContainer Module {
-                       get {
-                               return module;
-                       }
-               }
-
-               public static DynamicContext Create ()
-               {
-                       if (dc != null)
-                               return dc;
-
-                       lock (compiler_initializer) {
-                               if (dc != null)
-                                       return dc;
-
-                               var settings = new Compiler.CompilerSettings () {
-                                       WarningLevel = 0
-                               };
-
-                               var cc = new Compiler.CompilerContext (settings, ErrorPrinter.Instance) {
-                                       IsRuntimeBinder = true
-                               };
-
-                               //
-                               // Any later loaded assemblies are handled internally by GetAssemblyDefinition
-                               // domain.AssemblyLoad cannot be used as that would be too destructive as we
-                               // would hold all loaded assemblies even if they can be never visited
-                               //
-                               // TODO: Remove this code and rely on GetAssemblyDefinition only
-                               //
-                               var module = new Compiler.ModuleContainer (cc);
-                               module.HasTypesFullyDefined = true;
-                               
-                               // Setup fake assembly, it's used mostly to simplify checks like friend-access
-                               var temp = new Compiler.AssemblyDefinitionDynamic (module, "dynamic");
-                               module.SetDeclaringAssembly (temp);
-
-                               var importer = new Compiler.ReflectionImporter (module, cc.BuiltinTypes) {
-                                       IgnorePrivateMembers = false
-                               };
-
-                               // Import all currently loaded assemblies
-                               // TODO: Rewrite this to populate type cache on-demand, that should greatly
-                               // reduce our start-up cost
-                               var domain = AppDomain.CurrentDomain;
-                               foreach (var a in AppDomain.CurrentDomain.GetAssemblies ()) {
-                                       importer.ImportAssembly (a, module.GlobalRootNamespace);
-                               }
-
-                               cc.BuiltinTypes.CheckDefinitions (module);
-                               module.InitializePredefinedTypes ();
-
-                               dc = new DynamicContext (module, importer);
-                       }
-
-                       return dc;
-               }
-
-               //
-               // Creates mcs expression from dynamic object
-               //
-               public Compiler.Expression CreateCompilerExpression (CSharpArgumentInfo info, DynamicMetaObject value)
-               {
-                       //
-                       // No type details provider, go with runtime type
-                       //
-                       if (info == null) {
-                               if (value.LimitType == typeof (object))
-                                       return new Compiler.NullLiteral (Compiler.Location.Null);
-
-                               return new Compiler.RuntimeValueExpression (value, ImportType (value.RuntimeType));
-                       }
-
-                       //
-                       // Value is known to be a type
-                       //
-                       if ((info.Flags & CSharpArgumentInfoFlags.IsStaticType) != 0)
-                               return new Compiler.TypeExpression (ImportType ((Type) value.Value), Compiler.Location.Null);
-
-                       if (value.Value == null &&
-                               (info.Flags & (CSharpArgumentInfoFlags.IsOut | CSharpArgumentInfoFlags.IsRef | CSharpArgumentInfoFlags.UseCompileTimeType)) == 0 &&
-                               value.LimitType == typeof (object)) {
-                               return new Compiler.NullLiteral (Compiler.Location.Null);
-                       }
-
-                       //
-                       // Use compilation time type when type was known not to be dynamic during compilation
-                       //
-                       Type value_type = (info.Flags & CSharpArgumentInfoFlags.UseCompileTimeType) != 0 ? value.Expression.Type : value.LimitType;
-                       var type = ImportType (value_type);
-
-                       if ((info.Flags & CSharpArgumentInfoFlags.Constant) != 0) {
-                               var c = Compiler.Constant.CreateConstantFromValue (type, value.Value, Compiler.Location.Null);
-                               //
-                               // It can be null for misused Constant flag
-                               //
-                               if (c != null)
-                                       return c;
-                       }
-
-                       return new Compiler.RuntimeValueExpression (value, type);
-               }
-
-               //
-               // Creates mcs arguments from dynamic argument info
-               //
-               public Compiler.Arguments CreateCompilerArguments (IEnumerable<CSharpArgumentInfo> info, DynamicMetaObject[] args)
-               {
-                       var res = new Compiler.Arguments (args.Length);
-                       int pos = 0;
-
-                       // enumerates over args
-                       foreach (var item in info) {
-                               var expr = CreateCompilerExpression (item, args[pos++]);
-                               if (item.IsNamed) {
-                                       res.Add (new Compiler.NamedArgument (item.Name, Compiler.Location.Null, expr, item.ArgumentModifier));
-                               } else {
-                                       res.Add (new Compiler.Argument (expr, item.ArgumentModifier));
-                               }
-
-                               if (pos == args.Length)
-                                       break;
-                       }
-
-                       return res;
-               }
-
-               public Compiler.TypeSpec ImportType (Type type)
-               {
-                       lock (lock_object) {
-                               return importer.ImportType (type);
-                       }
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs
deleted file mode 100644 (file)
index 874953a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// ErrorPrinter.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       class ErrorPrinter : Compiler.ReportPrinter
-       {
-               public static readonly ErrorPrinter Instance = new ErrorPrinter ();
-
-               private ErrorPrinter ()
-               {
-               }
-
-               public override bool HasRelatedSymbolSupport {
-                       get {
-                               return false;
-                       }
-               }
-
-               public override void Print (Compiler.AbstractMessage msg, bool showFullPath)
-               {
-                       string text;
-                       if (msg.Code == 214) {
-                               text = "Pointers and fixed size buffers cannot be used in a dynamic context";
-                       } else {
-                               text = msg.Text;
-                       }
-
-                       throw new RuntimeBinderException (text);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs
deleted file mode 100644 (file)
index 9a55598..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// CSharpInvokeMemberBinder.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Dynamic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       static class Extensions
-       {
-               public static IList<T> ToReadOnly<T> (this IEnumerable<T> col)
-               {
-                       return col == null ? 
-                               null : new ReadOnlyCollectionBuilder<T> (col);
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs
deleted file mode 100644 (file)
index e2b38db..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// RuntimeBinderContext.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using Compiler = Mono.CSharp;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       sealed class RuntimeBinderContext : Compiler.IMemberContext
-       {
-               readonly Compiler.ModuleContainer module;
-               readonly Type callingType;
-               readonly DynamicContext ctx;
-               Compiler.TypeSpec callingTypeImported;
-
-               public RuntimeBinderContext (DynamicContext ctx, Compiler.TypeSpec callingType)
-               {
-                       this.ctx = ctx;
-                       this.module = ctx.Module;
-                       this.callingTypeImported = callingType;
-               }
-
-               public RuntimeBinderContext (DynamicContext ctx, Type callingType)
-               {
-                       this.ctx = ctx;
-                       this.module = ctx.Module;
-                       this.callingType = callingType;
-               }
-
-               #region IMemberContext Members
-
-               public Compiler.TypeSpec CurrentType {
-                       get {
-                               //
-                               // Delay importing of calling type to be compatible with .net
-                               // Some libraries are setting it to null which is invalid
-                               // but the NullReferenceException is thrown only when the context
-                               // is used and not during initialization
-                               //
-                               if (callingTypeImported == null && callingType != null)
-                                       callingTypeImported = ctx.ImportType (callingType);
-
-                               return callingTypeImported;
-                       }
-               }
-
-               public Compiler.TypeParameters CurrentTypeParameters {
-                       get { throw new NotImplementedException (); }
-               }
-
-               public Compiler.MemberCore CurrentMemberDefinition {
-                       get {
-                               return null;
-                       }
-               }
-
-               public bool IsObsolete {
-                       get {
-                               // Always true to ignore obsolete attribute checks
-                               return true;
-                       }
-               }
-
-               public bool IsUnsafe {
-                       get {
-                               // Dynamic cannot be used with pointers
-                               return false;
-                       }
-               }
-
-               public bool IsStatic {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-
-               public Compiler.ModuleContainer Module {
-                       get {
-                               return module;
-                       }
-               }
-
-               public string GetSignatureForError ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public Compiler.ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
-               {
-                       // No extension method lookup in this context
-                       return null;
-               }
-
-               public Compiler.FullNamedExpression LookupNamespaceOrType (string name, int arity, Mono.CSharp.LookupMode mode, Mono.CSharp.Location loc)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public Compiler.FullNamedExpression LookupNamespaceAlias (string name)
-               {
-                       // No namespace aliases in this context
-                       return null;
-               }
-
-               #endregion
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs
deleted file mode 100644 (file)
index f30f77a..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// RuntimeBinderException.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       [Serializable]
-       public class RuntimeBinderException : Exception
-       {
-               public RuntimeBinderException ()
-               {
-               }
-
-               public RuntimeBinderException (string message)
-                       : base (message)
-               {
-               }
-
-               public RuntimeBinderException (string message, Exception innerException)
-                       : base (message, innerException)
-               {
-               }
-
-               protected RuntimeBinderException (SerializationInfo info, StreamingContext context)
-                       : base (info, context)
-               {
-               }
-       }
-}
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs
deleted file mode 100644 (file)
index 83e3cc2..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// RuntimeBinderInternalCompilerException.cs
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Microsoft.CSharp.RuntimeBinder
-{
-       [Serializable]
-       public class RuntimeBinderInternalCompilerException : Exception
-       {
-               public RuntimeBinderInternalCompilerException ()
-               {
-               }
-
-               public RuntimeBinderInternalCompilerException (string message)
-                       : base (message)
-               {
-               }
-
-               public RuntimeBinderInternalCompilerException (string message, Exception innerException)
-                       : base (message, innerException)
-               {
-               }
-
-               protected RuntimeBinderInternalCompilerException (SerializationInfo info, StreamingContext context)
-                       : base (info, context)
-               {
-               }
-       }
-}
index 3d6d20b5e756f28988a4b1e07db8e5438a1193ab..96568b47086a250a16e207c7412796ff9a4a55a8 100644 (file)
 Assembly/AssemblyInfo.cs
-Microsoft.CSharp.RuntimeBinder/Binder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs
-Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs
-Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs
-Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs
-Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs
-Microsoft.CSharp.RuntimeBinder/DynamicContext.cs
-Microsoft.CSharp.RuntimeBinder/Extensions.cs
-Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs
-Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs
-Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs
-Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs
-Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs
+../../build/common/SR.cs
+../../build/common/Consts.cs
+
+corefx/SR.cs
+
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Binder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpArgumentInfo.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpArgumentInfoFlags.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationFlags.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinderFlags.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpCallFlags.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConversionKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CController.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CError.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CErrorFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CParameterizedError.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFmt.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/IErrorSink.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/MessageID.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpInvokeOrInvokeMemberBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ResetBindException.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderController.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderInternalCompilerException.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContextBase.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContexts.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingFlag.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/CandidateFunctionMember.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ConstVal.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ConstValFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/COperators.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/Declaration.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/GlobalAttributeDeclaration.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/NamespaceDeclaration.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRFLAG.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FileRecord.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FundamentalTypes.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/InputFile.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ITypeOrNamespace.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/LangCompiler.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MetadataToken.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/NameGenerator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/NullableLift.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/OriginalExpressions.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedAttributes.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AssemblyQualifiedNamespaceSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/EventSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/IndexerSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LabelSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LocalVariableSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodOrPropertySymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MiscSymFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/ParentSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/PropertySymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Scope.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactoryBase.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TransparentIdentifierMemberSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TypeParameterSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/UnresolvedAggregateSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/VariableSymbol.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayIndex.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayInitialization.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayLength.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Assignment.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BinaryOperator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Block.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Call.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Class.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/CompoundOperator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ConditionalOperator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Event.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExpressionIterator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/FieldInfo.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/HoistedLocal.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/List.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/LocalVariable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodReference.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/NamedArgumentSpecification.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Return.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Statement.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Temporary.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/This.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeArguments.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOrNamespace.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnaryOperator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnboundAnonymousFunction.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedConversion.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedLogicalOperator.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/BoundLambdaType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ErrorType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/OpenTypePlaceholderType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeKind.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/KnownName.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameManager.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Names.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameTable.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Operators.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedName.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedType.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenFacts.cs
+../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenKind.cs
diff --git a/mcs/class/Microsoft.CSharp/corefx/SR.cs b/mcs/class/Microsoft.CSharp/corefx/SR.cs
new file mode 100644 (file)
index 0000000..c4b854b
--- /dev/null
@@ -0,0 +1,134 @@
+//
+// This file was generated by resx2sr tool
+//
+
+partial class SR
+{
+       public const string InternalCompilerError = "An unexpected exception occurred while binding a dynamic operation";
+       public const string BindRequireArguments = "Cannot bind call with no calling object";
+       public const string BindCallFailedOverloadResolution = "Overload resolution failed";
+       public const string BindBinaryOperatorRequireTwoArguments = "Binary operators must be invoked with two arguments";
+       public const string BindUnaryOperatorRequireOneArgument = "Unary operators must be invoked with one argument";
+       public const string BindPropertyFailedMethodGroup = "The name '{0}' is bound to a method and cannot be used like a property";
+       public const string BindPropertyFailedEvent = "The event '{0}' can only appear on the left hand side of +";
+       public const string BindInvokeFailedNonDelegate = "Cannot invoke a non-delegate type";
+       public const string BindImplicitConversionRequireOneArgument = "Implicit conversion takes exactly one argument";
+       public const string BindExplicitConversionRequireOneArgument = "Explicit conversion takes exactly one argument";
+       public const string BindBinaryAssignmentRequireTwoArguments = "Binary operators cannot be invoked with one argument";
+       public const string BindBinaryAssignmentFailedNullReference = "Cannot perform member assignment on a null reference";
+       public const string NullReferenceOnMemberException = "Cannot perform runtime binding on a null reference";
+       public const string BindCallToConditionalMethod = "Cannot dynamically invoke method '{0}' because it has a Conditional attribute";
+       public const string BindToVoidMethodButExpectResult = "Cannot implicitly convert type 'void' to 'object'";
+       public const string BadBinaryOps = "Operator '{0}' cannot be applied to operands of type '{1}' and '{2}'";
+       public const string IntDivByZero = "Division by constant zero";
+       public const string BadIndexLHS = "Cannot apply indexing with [] to an expression of type '{0}'";
+       public const string BadIndexCount = "Wrong number of indices inside []; expected '{0}'";
+       public const string BadUnaryOp = "Operator '{0}' cannot be applied to operand of type '{1}'";
+       public const string NoImplicitConv = "Cannot implicitly convert type '{0}' to '{1}'";
+       public const string NoExplicitConv = "Cannot convert type '{0}' to '{1}'";
+       public const string ConstOutOfRange = "Constant value '{0}' cannot be converted to a '{1}'";
+       public const string AmbigBinaryOps = "Operator '{0}' is ambiguous on operands of type '{1}' and '{2}'";
+       public const string AmbigUnaryOp = "Operator '{0}' is ambiguous on an operand of type '{1}'";
+       public const string ValueCantBeNull = "Cannot convert null to '{0}' because it is a non-nullable value type";
+       public const string WrongNestedThis = "Cannot access a non-static member of outer type '{0}' via nested type '{1}'";
+       public const string NoSuchMember = "'{0}' does not contain a definition for '{1}'";
+       public const string ObjectRequired = "An object reference is required for the non-static field, method, or property '{0}'";
+       public const string AmbigCall = "The call is ambiguous between the following methods or properties: '{0}' and '{1}'";
+       public const string BadAccess = "'{0}' is inaccessible due to its protection level";
+       public const string MethDelegateMismatch = "No overload for '{0}' matches delegate '{1}'";
+       public const string AssgLvalueExpected = "The left-hand side of an assignment must be a variable, property or indexer";
+       public const string NoConstructors = "The type '{0}' has no constructors defined";
+       public const string BadDelegateConstructor = "The delegate '{0}' does not have a valid constructor";
+       public const string PropertyLacksGet = "The property or indexer '{0}' cannot be used in this context because it lacks the get accessor";
+       public const string ObjectProhibited = "Member '{0}' cannot be accessed with an instance reference; qualify it with a type name instead";
+       public const string AssgReadonly = "A readonly field cannot be assigned to (except in a constructor or a variable initializer)";
+       public const string RefReadonly = "A readonly field cannot be passed ref or out (except in a constructor)";
+       public const string AssgReadonlyStatic = "A static readonly field cannot be assigned to (except in a static constructor or a variable initializer)";
+       public const string RefReadonlyStatic = "A static readonly field cannot be passed ref or out (except in a static constructor)";
+       public const string AssgReadonlyProp = "Property or indexer '{0}' cannot be assigned to -- it is read only";
+       public const string AbstractBaseCall = "Cannot call an abstract base member: '{0}'";
+       public const string RefProperty = "A property or indexer may not be passed as an out or ref parameter";
+       public const string ManagedAddr = "Cannot take the address of, get the size of, or declare a pointer to a managed type ('{0}')";
+       public const string FixedNotNeeded = "You cannot use the fixed statement to take the address of an already fixed expression";
+       public const string UnsafeNeeded = "Dynamic calls cannot be used in conjunction with pointers";
+       public const string BadBoolOp = "In order to be applicable as a short circuit operator a user-defined logical operator ('{0}') must have the same return type as the type of its 2 parameters";
+       public const string MustHaveOpTF = "The type ('{0}') must contain declarations of operator true and operator false";
+       public const string CheckedOverflow = "The operation overflows at compile time in checked mode";
+       public const string ConstOutOfRangeChecked = "Constant value '{0}' cannot be converted to a '{1}' (use 'unchecked' syntax to override)";
+       public const string AmbigMember = "Ambiguity between '{0}' and '{1}'";
+       public const string SizeofUnsafe = "'{0}' does not have a predefined size, therefore sizeof can only be used in an unsafe context (consider using System.Runtime.InteropServices.Marshal.SizeOf)";
+       public const string FieldInitRefNonstatic = "A field initializer cannot reference the non-static field, method, or property '{0}'";
+       public const string CallingFinalizeDepracated = "Destructors and object.Finalize cannot be called directly. Consider calling IDisposable.Dispose if available.";
+       public const string CallingBaseFinalizeDeprecated = "Do not directly call your base class Finalize method. It is called automatically from your destructor.";
+       public const string BadCastInFixed = "The right hand side of a fixed statement assignment may not be a cast expression";
+       public const string NoImplicitConvCast = "Cannot implicitly convert type '{0}' to '{1}'. An explicit conversion exists (are you missing a cast?)";
+       public const string InaccessibleGetter = "The property or indexer '{0}' cannot be used in this context because the get accessor is inaccessible";
+       public const string InaccessibleSetter = "The property or indexer '{0}' cannot be used in this context because the set accessor is inaccessible";
+       public const string BadArity = "Using the generic {1} '{0}' requires '{2}' type arguments";
+       public const string BadTypeArgument = "The type '{0}' may not be used as a type argument";
+       public const string TypeArgsNotAllowed = "The {1} '{0}' cannot be used with type arguments";
+       public const string HasNoTypeVars = "The non-generic {1} '{0}' cannot be used with type arguments";
+       public const string NewConstraintNotSatisfied = "'{2}' must be a non-abstract type with a public parameterless constructor in order to use it as parameter '{1}' in the generic type or method '{0}'";
+       public const string GenericConstraintNotSatisfiedRefType = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no implicit reference conversion from '{3}' to '{1}'.";
+       public const string GenericConstraintNotSatisfiedNullableEnum = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. The nullable type '{3}' does not satisfy the constraint of '{1}'.";
+       public const string GenericConstraintNotSatisfiedNullableInterface = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. The nullable type '{3}' does not satisfy the constraint of '{1}'. Nullable types can not satisfy any interface constraints.";
+       public const string GenericConstraintNotSatisfiedTyVar = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no boxing conversion or type parameter conversion from '{3}' to '{1}'.";
+       public const string GenericConstraintNotSatisfiedValType = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no boxing conversion from '{3}' to '{1}'.";
+       public const string TypeVarCantBeNull = "Cannot convert null to type parameter '{0}' because it could be a non-nullable value type. Consider using 'default({0})' instead.";
+       public const string BadRetType = "'{1} {0}' has the wrong return type";
+       public const string CantInferMethTypeArgs = "The type arguments for method '{0}' cannot be inferred from the usage. Try specifying the type arguments explicitly.";
+       public const string MethGrpToNonDel = "Cannot convert method group '{0}' to non-delegate type '{1}'. Did you intend to invoke the method?";
+       public const string RefConstraintNotSatisfied = "The type '{2}' must be a reference type in order to use it as parameter '{1}' in the generic type or method '{0}'";
+       public const string ValConstraintNotSatisfied = "The type '{2}' must be a non-nullable value type in order to use it as parameter '{1}' in the generic type or method '{0}'";
+       public const string CircularConstraint = "Circular constraint dependency involving '{0}' and '{1}'";
+       public const string BaseConstraintConflict = "Type parameter '{0}' inherits conflicting constraints '{1}' and '{2}'";
+       public const string ConWithValCon = "Type parameter '{1}' has the 'struct' constraint so '{1}' cannot be used as a constraint for '{0}'";
+       public const string AmbigUDConv = "Ambiguous user defined conversions '{0}' and '{1}' when converting from '{2}' to '{3}'";
+       public const string PredefinedTypeNotFound = "Predefined type '{0}' is not defined or imported";
+       public const string PredefinedTypeBadType = "Predefined type '{0}' is declared incorrectly";
+       public const string BindToBogus = "'{0}' is not supported by the language";
+       public const string CantCallSpecialMethod = "'{0}': cannot explicitly call operator or accessor";
+       public const string BogusType = "'{0}' is a type not supported by the language";
+       public const string MissingPredefinedMember = "Missing compiler required member '{0}.{1}'";
+       public const string LiteralDoubleCast = "Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type";
+       public const string UnifyingInterfaceInstantiations = "'{0}' cannot implement both '{1}' and '{2}' because they may unify for some type parameter substitutions";
+       public const string ConvertToStaticClass = "Cannot convert to static type '{0}'";
+       public const string GenericArgIsStaticClass = "'{0}': static types cannot be used as type arguments";
+       public const string PartialMethodToDelegate = "Cannot create delegate from method '{0}' because it is a partial method without an implementing declaration";
+       public const string IncrementLvalueExpected = "The operand of an increment or decrement operator must be a variable, property or indexer";
+       public const string NoSuchMemberOrExtension = "'{0}' does not contain a definition for '{1}' and no extension method '{1}' accepting a first argument of type '{0}' could be found (are you missing a using directive or an assembly reference?)";
+       public const string ValueTypeExtDelegate = "Extension methods '{0}' defined on value type '{1}' cannot be used to create delegates";
+       public const string BadArgCount = "No overload for method '{0}' takes '{1}' arguments";
+       public const string BadArgTypes = "The best overloaded method match for '{0}' has some invalid arguments";
+       public const string BadArgType = "Argument '{0}': cannot convert from '{1}' to '{2}'";
+       public const string RefLvalueExpected = "A ref or out argument must be an assignable variable";
+       public const string BadProtectedAccess = "Cannot access protected member '{0}' via a qualifier of type '{1}'; the qualifier must be of type '{2}' (or derived from it)";
+       public const string BindToBogusProp2 = "Property, indexer, or event '{0}' is not supported by the language; try directly calling accessor methods '{1}' or '{2}'";
+       public const string BindToBogusProp1 = "Property, indexer, or event '{0}' is not supported by the language; try directly calling accessor method '{1}'";
+       public const string BadDelArgCount = "Delegate '{0}' does not take '{1}' arguments";
+       public const string BadDelArgTypes = "Delegate '{0}' has some invalid arguments";
+       public const string AssgReadonlyLocal = "Cannot assign to '{0}' because it is read-only";
+       public const string RefReadonlyLocal = "Cannot pass '{0}' as a ref or out argument because it is read-only";
+       public const string ReturnNotLValue = "Cannot modify the return value of '{0}' because it is not a variable";
+       public const string BadArgExtraRef = "Argument '{0}' should not be passed with the '{1}' keyword";
+       public const string BadArgRef = "Argument '{0}' must be passed with the '{1}' keyword";
+       public const string AssgReadonly2 = "Members of readonly field '{0}' cannot be modified (except in a constructor or a variable initializer)";
+       public const string RefReadonly2 = "Members of readonly field '{0}' cannot be passed ref or out (except in a constructor)";
+       public const string AssgReadonlyStatic2 = "Fields of static readonly field '{0}' cannot be assigned to (except in a static constructor or a variable initializer)";
+       public const string RefReadonlyStatic2 = "Fields of static readonly field '{0}' cannot be passed ref or out (except in a static constructor)";
+       public const string AssgReadonlyLocalCause = "Cannot assign to '{0}' because it is a '{1}'";
+       public const string RefReadonlyLocalCause = "Cannot pass '{0}' as a ref or out argument because it is a '{1}'";
+       public const string ThisStructNotInAnonMeth = "Anonymous methods, lambda expressions, and query expressions inside structs cannot access instance members of 'this'. Consider copying 'this' to a local variable outside the anonymous method, lambda expression or query expression and using the local instead.";
+       public const string DelegateOnNullable = "Cannot bind delegate to '{0}' because it is a member of 'System.Nullable<T>'";
+       public const string BadCtorArgCount = "'{0}' does not contain a constructor that takes '{1}' arguments";
+       public const string BadExtensionArgTypes = "'{0}' does not contain a definition for '{1}' and the best extension method overload '{2}' has some invalid arguments";
+       public const string BadInstanceArgType = "Instance argument: cannot convert from '{0}' to '{1}'";
+       public const string BadArgTypesForCollectionAdd = "The best overloaded Add method '{0}' for the collection initializer has some invalid arguments";
+       public const string InitializerAddHasParamModifiers = "The best overloaded method match '{0}' for the collection initializer element cannot be used. Collection initializer 'Add' methods cannot have ref or out parameters.";
+       public const string NonInvocableMemberCalled = "Non-invocable member '{0}' cannot be used like a method.";
+       public const string NamedArgumentSpecificationBeforeFixedArgument = "Named argument specifications must appear after all fixed arguments have been specified";
+       public const string BadNamedArgument = "The best overload for '{0}' does not have a parameter named '{1}'";
+       public const string BadNamedArgumentForDelegateInvoke = "The delegate '{0}' does not have a parameter named '{1}'";
+       public const string DuplicateNamedArgument = "Named argument '{0}' cannot be specified multiple times";
+       public const string NamedArgumentUsedInPositional = "Named argument '{0}' specifies a parameter for which a positional argument has already been given";
+}
index eaec4ddcd40395077c61ecfdfeba017c20e532b6..bcf9c8dc840837d91b897beb213bcc4e2b3e9ee0 100644 (file)
     <Compile Include="..\..\mcs\typespec.cs" />\r
     <Compile Include="..\..\mcs\visit.cs" />\r
     <Compile Include="..\..\tools\monop\outline.cs" />\r
+    <Compile Include="aot.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
index 0bbd93782bad9ef8544de3ababc6b5860cc69dcb..2bd1a5a5f4197764209bc897f79422b68546c904 100644 (file)
@@ -1,3 +1,5 @@
+Assembly/AssemblyInfo.cs
+aot.cs
 ../../mcs/anonymous.cs
 ../../mcs/argument.cs
 ../../mcs/assign.cs
@@ -55,4 +57,3 @@
 ../../build/common/Consts.cs
 ../../tools/monop/outline.cs
 ../../mcs/cs-parser.cs
-Assembly/AssemblyInfo.cs
diff --git a/mcs/class/Mono.CSharp/aot.cs b/mcs/class/Mono.CSharp/aot.cs
new file mode 100644 (file)
index 0000000..844d761
--- /dev/null
@@ -0,0 +1,105 @@
+//
+// aot.cs: AOT System.Reflection.Emit extensions to simplify mcs compilation
+//
+// Authors:
+//     Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if FULL_AOT_RUNTIME
+
+namespace System.Reflection.Emit
+{
+       static class AssemblyBuilderExtensions
+       {
+               public static void AddResourceFile (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static ModuleBuilder DefineDynamicModule (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static void DefineVersionInfoResource (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static void DefineUnmanagedResource (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static void Save (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static void SetEntryPoint (this AssemblyBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+       }
+
+       static class ConstructorBuilderExtensions
+       {
+               public static void AddDeclarativeSecurity (this ConstructorBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+       }
+
+       static class MethodBuilderExtensions
+       {
+               public static void AddDeclarativeSecurity (this MethodBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+       }
+
+       static class ModuleBuilderExtensions
+       {
+               public static void DefineManifestResource (this ModuleBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+       }
+
+       static class TypeBuilderExtensions
+       {
+               public static void AddDeclarativeSecurity (this TypeBuilder builder, params object[] args)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public static Type CreateType (this TypeBuilder builder)
+               {
+                       throw new NotSupportedException ();
+               }
+       }
+}
+#endif
diff --git a/mcs/class/Mono.CSharp/monotouch.cs b/mcs/class/Mono.CSharp/monotouch.cs
deleted file mode 100644 (file)
index 06feb3c..0000000
+++ /dev/null
@@ -1,824 +0,0 @@
-//
-// monotouch.cs: iOS System.Reflection.Emit API needed to simplify mcs compilation
-//
-// Authors:
-//     Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Reflection.Emit
-{
-       public class TypeBuilder : Type
-       {
-               #region implemented abstract members of MemberInfo
-
-               public override bool IsDefined (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override string Name {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               #region implemented abstract members of Type
-
-               public override Type GetInterface (string name, bool ignoreCase)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type[] GetInterfaces ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type GetElementType ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override EventInfo GetEvent (string name, BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override EventInfo[] GetEvents (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override FieldInfo GetField (string name, BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override FieldInfo[] GetFields (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override MemberInfo[] GetMembers (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override MethodInfo GetMethodImpl (string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override MethodInfo[] GetMethods (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type GetNestedType (string name, BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type[] GetNestedTypes (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override PropertyInfo[] GetProperties (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override PropertyInfo GetPropertyImpl (string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override TypeAttributes GetAttributeFlagsImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool HasElementTypeImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool IsArrayImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool IsByRefImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool IsCOMObjectImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool IsPointerImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               protected override bool IsPrimitiveImpl ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override ConstructorInfo[] GetConstructors (BindingFlags bindingAttr)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object InvokeMember (string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, System.Globalization.CultureInfo culture, string[] namedParameters)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Assembly Assembly {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string AssemblyQualifiedName {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type BaseType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string FullName {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Guid GUID {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Module Module {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string Namespace {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type UnderlyingSystemType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               public void AddInterfaceImplementation (Type interfaceType)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void AddDeclarativeSecurity (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }       
-
-               public void SetParent (object arg)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public Type CreateType()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ConstructorBuilder DefineConstructor (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public MethodBuilder DefineMethod (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public TypeBuilder DefineNestedType (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public PropertyBuilder DefineProperty (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public EventBuilder DefineEvent (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public FieldBuilder DefineField (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public MethodBuilder DefineMethodOverride (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public static ConstructorInfo GetConstructor (Type type, ConstructorInfo constructor)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public static FieldInfo GetField (Type type, FieldInfo field)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public static MethodInfo GetMethod (Type type, MethodInfo method)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class MethodBuilder : MethodBase
-       {
-               #region implemented abstract members of MemberInfo
-
-               public override bool IsDefined (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type DeclaringType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override MemberTypes MemberType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string Name {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type ReflectedType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               #region implemented abstract members of MethodBase
-
-               public override MethodImplAttributes GetMethodImplementationFlags ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override ParameterInfo[] GetParameters ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object Invoke (object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, System.Globalization.CultureInfo culture)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override RuntimeMethodHandle MethodHandle {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override MethodAttributes Attributes {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               public void AddDeclarativeSecurity (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ParameterBuilder DefineParameter (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public MethodToken GetToken()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ILGenerator GetILGenerator ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetImplementationFlags (MethodImplAttributes attributes)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetParameters (params Type[] parameterTypes)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetReturnType (object arg)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class AssemblyBuilder : Assembly
-       {
-               public void AddResourceFile (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void DefineVersionInfoResource (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ModuleBuilder DefineDynamicModule (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void DefineUnmanagedResource (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void Save (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetEntryPoint (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class ConstructorBuilder : MethodBase
-       {
-               #region implemented abstract members of MemberInfo
-
-               public override bool IsDefined (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type DeclaringType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override MemberTypes MemberType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string Name {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type ReflectedType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               #region implemented abstract members of MethodBase
-
-               public override MethodImplAttributes GetMethodImplementationFlags ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override ParameterInfo[] GetParameters ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object Invoke (object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, System.Globalization.CultureInfo culture)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override RuntimeMethodHandle MethodHandle {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override MethodAttributes Attributes {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               public void AddDeclarativeSecurity (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ParameterBuilder DefineParameter (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }               
-
-               public MethodToken GetToken()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public ILGenerator GetILGenerator ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetImplementationFlags (MethodImplAttributes attributes)
-               {
-                       throw new NotSupportedException ();
-               }       
-       }
-
-       public class ModuleBuilder : Module
-       {
-               public void DefineManifestResource (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public TypeBuilder DefineType (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public MethodToken GetToken()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public MethodInfo GetArrayMethod (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class PropertyBuilder : PropertyInfo
-       {
-               #region implemented abstract members of MemberInfo
-
-               public override bool IsDefined (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type DeclaringType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string Name {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type ReflectedType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               #region implemented abstract members of PropertyInfo
-
-               public override MethodInfo[] GetAccessors (bool nonPublic)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override MethodInfo GetGetMethod (bool nonPublic)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override ParameterInfo[] GetIndexParameters ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override MethodInfo GetSetMethod (bool nonPublic)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object GetValue (object obj, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override void SetValue (object obj, object value, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override PropertyAttributes Attributes {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override bool CanRead {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override bool CanWrite {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type PropertyType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               public MethodToken GetToken()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetGetMethod (object arg)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetSetMethod (object arg)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class FieldBuilder : FieldInfo
-       {
-               #region implemented abstract members of MemberInfo
-
-               public override bool IsDefined (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override object[] GetCustomAttributes (Type attributeType, bool inherit)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override Type DeclaringType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override string Name {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type ReflectedType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               #region implemented abstract members of FieldInfo
-
-               public override object GetValue (object obj)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override void SetValue (object obj, object value, BindingFlags invokeAttr, Binder binder, System.Globalization.CultureInfo culture)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override FieldAttributes Attributes {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override RuntimeFieldHandle FieldHandle {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               public override Type FieldType {
-                       get {
-                               throw new NotSupportedException ();
-                       }
-               }
-
-               #endregion
-
-               public void SetConstant (object arg)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public class EventBuilder
-       {
-               public void SetAddOnMethod (MethodBuilder mdBuilder)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetRemoveOnMethod (MethodBuilder mdBuilder)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public void SetCustomAttribute (params object[] args)
-               {
-                       throw new NotSupportedException ();
-               }
-       }
-
-}
\ No newline at end of file
diff --git a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 083e61a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 083e61a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 083e61a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 394cd48..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 4c30fc6..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs
diff --git a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 4c30fc6..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs
index 36d6822f61114952d3e7fa6f8645bb40dbd5a101..5654252415d15a297b8a808e5598932798dac170 100644 (file)
@@ -64,7 +64,7 @@ namespace Mono.CodeContracts.Rewrite {
 
                        var readerParameters = new ReaderParameters ();
 
-                       if (options.Debug)
+                       if (options.Debug && options.WritePdbFile)
                                readerParameters.ReadSymbols = true;
 
                        var assembly = this.options.Assembly.IsFilename ?
index efebe9ad5a9acc314ec75efbb1ffda5a9fb1ba7f..421c04da2bfd3b360a1fd5f2c9b17adfde0b221e 100644 (file)
@@ -134,7 +134,7 @@ testing.
                                        code ();
                                }
 
-               * Avoid using unecessary open/close braces, vertical space
+               * Avoid using unnecessary open/close braces, vertical space
                  is usually limited:
 
                        good:
index fac304161e6addedd37c2bc419987e84fdc324dd..19cd7e6be5df1d47f777be791aff7bdd0971a375 100644 (file)
@@ -90,7 +90,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.netstandard.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\HoistedLocals.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />\r
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedQueue.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />\r
index 7336284054710a8c125652ea245673b3e70a1aba..27d916c49d552f573fbea9fbcaf3835ea125e6b9 100644 (file)
@@ -13,7 +13,7 @@
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs
-../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/KeyedQueue.cs
+../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/KeyedStack.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LabelInfo.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Address.cs
 ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs
index 4ef6dc6b9c06702aed2719548535246b91ec3a26..24f91f3bef67b61465ba24629462d3c5ddb49ee7 100644 (file)
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbCommand.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnection.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionPoolKey.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilder.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataAdapter.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReader.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReaderExtensions.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataRecord.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataSourceEnumerator.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbEnumerator.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbMetaDataColumnNames.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbParameter.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbParameterCollection.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderFactory.CreatePermission.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderFactory.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBSchemaRow.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBSchemaTable.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbTransaction.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DecimalStorage.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DoubleStorage.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/FieldNameLookup.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Groupbybehavior.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/IDbColumnSchemaGenerator.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/identifiercase.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int16Storage.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int32Storage.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int64Storage.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/MultipartIdentifier.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePair.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ObjectStorage.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatedEventArgs.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatingEventArgs.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementCompletedEventArgs.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementCompletedEventHandler.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementType.cs
+../../../external/corefx/src/System.Data.Common/src/System/Data/StrongTypingException.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/UniqueConstraint.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/UpdateRowSource.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Data/updatestatus.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Xml/RegionIterator.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Xml/TreeIterator.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlBoundElement.cs
+../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataDocument.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataImplementation.cs
 ../../../external/corefx/src/System.Data.Common/src/System/Xml/XPathNodePointer.cs
-../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataDocument.cs
-
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/ActivityCorrelator.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/OperationAbortedException.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/ApplicationIntent.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlError.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlErrorCollection.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInfoMessageEvent.cs
+../../../external/corefx/src/System.Private.Xml/src/Misc/HResults.cs
 ../referencesource/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs
 ../referencesource/System.Data/Misc/ExternDll.cs
-../referencesource/System.Data/Misc/HResults.cs
 ../referencesource/System.Data/System/Data/CodeGen/StrongTypingException.cs
-../referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs
 ../referencesource/System.Data/System/Data/Common/AdapterUtil.cs
 ../referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs
-../referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs
 ../referencesource/System.Data/System/Data/Common/DBConnectionString.cs
-../referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs
 ../referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs
 ../referencesource/System.Data/System/Data/Common/DBDataPermission.cs
 ../referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs
-../referencesource/System.Data/System/Data/Common/DbDataReader.cs
-../referencesource/System.Data/System/Data/Common/DbProviderFactory.cs
-../referencesource/System.Data/System/Data/Common/FieldNameLookup.cs
 ../referencesource/System.Data/System/Data/Common/GreenMethods.cs
-../referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs
-../referencesource/System.Data/System/Data/Common/NameValuePair.cs
 ../referencesource/System.Data/System/Data/Common/NameValuePermission.cs
 ../referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs
+../referencesource/System.Data/System/Data/DataSet.cs
 ../referencesource/System.Data/System/Data/OleDb/OleDbType.cs
 ../referencesource/System.Data/System/Data/OleDb/PropertyAttributes.cs
-../referencesource/System.Data/System/Data/OperationAbortedException.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContext.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContextKey.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs
-../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs
-../referencesource/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs
-../referencesource/System.Data/System/Data/ProviderBase/TimeoutTimer.cs
 ../referencesource/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs
 ../referencesource/System.Data/System/Data/Sql/IBinarySerialize.cs
 ../referencesource/System.Data/System/Data/Sql/invalidudtexception.cs
 ../referencesource/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs
 ../referencesource/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs
 ../referencesource/System.Data/System/Data/Sql/TriggerAction.cs
-../referencesource/System.Data/System/Data/SqlClient/ApplicationIntent.cs
 ../referencesource/System.Data/System/Data/SqlClient/LocalDBAPI.cs
 ../referencesource/System.Data/System/Data/SqlClient/SqlClientEncryptionType.cs
 ../referencesource/System.Data/System/Data/SqlClient/SqlClientPermission.cs
 ../referencesource/System.Data/System/Data/SqlClient/SqlConnectionString.cs
 ../referencesource/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs
-../referencesource/System.Data/System/Data/SqlClient/SqlError.cs
-../referencesource/System.Data/System/Data/SqlClient/SqlErrorCollection.cs
-../referencesource/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs
 ../referencesource/System.Data/System/Data/SqlClient/SqlUtil.cs
 ../referencesource/System.Data/System/Data/SqlClient/TdsEnums.cs
-../referencesource/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs
-../referencesource/System.Data/System/Data/DataSet.cs
\ No newline at end of file
+../referencesource/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs
\ No newline at end of file
index fd236c73f6b9f058f6891a15cee7ccfc8960a7cf..4977214850bd9c481c04f58cc818691a9bc1bb9b 100644 (file)
@@ -160,7 +160,7 @@ System.Data.Common/DbConnectionStringBuilderHelper.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolCounters.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPool.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs
-../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs
+../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs
 ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs
 # ../referencesource/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs
 # ../referencesource/System.Data/System/Data/ProviderBase/DbParameterHelper.cs
index a3335ea5506ffe67aafedba5773301d48b9cee77..4aeaf50cd931ec9a513c0d4da69bb30f1bfe1e15 100644 (file)
@@ -292,8 +292,9 @@ namespace System.Net.Http
                                }
 
                                if (header.Key == "Transfer-Encoding") {
-                                       // Chunked Transfer-Encoding is never set for HttpWebRequest. It's detected
-                                       // from ContentLength by HttpWebRequest
+                                       //
+                                       // Chunked Transfer-Encoding is set for HttpWebRequest later when Content length is checked
+                                       //
                                        values = values.Where (l => l != "chunked");
                                }
 
@@ -354,15 +355,22 @@ namespace System.Net.Http
                                                        }
                                                }
 
-                                               //
-                                               // Content length has to be set because HttpWebRequest is running without buffering
-                                               //
-                                               var contentLength = content.Headers.ContentLength;
-                                               if (contentLength != null) {
-                                                       wrequest.ContentLength = contentLength.Value;
+                                               if (request.Headers.TransferEncodingChunked == true) {
+                                                       wrequest.SendChunked = true;
                                                } else {
-                                                       await content.LoadIntoBufferAsync (MaxRequestContentBufferSize).ConfigureAwait (false);
-                                                       wrequest.ContentLength = content.Headers.ContentLength.Value;
+                                                       //
+                                                       // Content length has to be set because HttpWebRequest is running without buffering
+                                                       //
+                                                       var contentLength = content.Headers.ContentLength;
+                                                       if (contentLength != null) {
+                                                               wrequest.ContentLength = contentLength.Value;
+                                                       } else {
+                                                               if (MaxRequestContentBufferSize == 0)
+                                                                       throw new InvalidOperationException ("The content length of the request content can't be determined. Either set TransferEncodingChunked to true, load content into buffer, or set MaxRequestContentBufferSize.");
+
+                                                               await content.LoadIntoBufferAsync (MaxRequestContentBufferSize).ConfigureAwait (false);
+                                                               wrequest.ContentLength = content.Headers.ContentLength.Value;
+                                                       }
                                                }
 
                                                wrequest.ResendContentFactory = content.CopyTo;
@@ -394,7 +402,6 @@ namespace System.Net.Http
                        return CreateResponseMessage (wresponse, request, cancellationToken);
                }
 
-#if NETSTANDARD
                public bool CheckCertificateRevocationList {
                        get {
                                throw new NotImplementedException ();
@@ -460,7 +467,5 @@ namespace System.Net.Http
                                throw new NotImplementedException ();
                        }
                }
-
-#endif
        }
 }
index eb5b7ffa8207a82dcaaa6a9df7e12337a0e959f3..f796a202d543d82c8afd5c9b3d73c7aac1900b93 100644 (file)
@@ -131,7 +131,6 @@ namespace System.Net.Http
                        throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
                }
 
-#if NETSTANDARD
                public bool CheckCertificateRevocationList {
                        get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
                        set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
@@ -170,6 +169,5 @@ namespace System.Net.Http
                        get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
                        set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
                }
-#endif
        }
 }
index d9aab417dfa00762ff0848ae78385316ada5a7e3..72508c4883349ae19ada77271c939bfe18c04264 100644 (file)
@@ -1093,6 +1093,110 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
+               [Test]
+#if FEATURE_NO_BSD_SOCKETS
+               [ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
+               public void Post_TransferEncodingChunked ()
+               {
+                       bool? failed = null;
+                       var listener = CreateListener (l => {
+                               try {
+                                       var request = l.Request;
+
+                                       Assert.IsNull (request.AcceptTypes, "#1");
+                                       Assert.AreEqual (-1, request.ContentLength64, "#2");
+                                       Assert.IsNull (request.ContentType, "#3");
+                                       Assert.AreEqual (0, request.Cookies.Count, "#4");
+                                       Assert.IsTrue (request.HasEntityBody, "#5");
+                                       Assert.AreEqual (TestHost, request.Headers ["Host"], "#6b");
+                                       Assert.AreEqual ("POST", request.HttpMethod, "#7");
+                                       Assert.IsFalse (request.IsAuthenticated, "#8");
+                                       Assert.IsTrue (request.IsLocal, "#9");
+                                       Assert.IsFalse (request.IsSecureConnection, "#10");
+                                       Assert.IsFalse (request.IsWebSocketRequest, "#11");
+                                       Assert.IsTrue (request.KeepAlive, "#12");
+                                       Assert.AreEqual (HttpVersion.Version11, request.ProtocolVersion, "#13");
+                                       Assert.IsNull (request.ServiceName, "#14");
+                                       Assert.IsNull (request.UrlReferrer, "#15");
+                                       Assert.IsNull (request.UserAgent, "#16");
+                                       Assert.IsNull (request.UserLanguages, "#17");
+                                       Assert.AreEqual ("chunked", request.Headers ["Transfer-Encoding"], "#18");
+                                       Assert.IsNull (request.Headers ["Content-Length"], "#19");
+                                       failed = false;
+                               } catch (Exception e) {
+                                       failed = true;
+                                       Console.WriteLine (e);
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+
+                               client.DefaultRequestHeaders.TransferEncodingChunked = true;
+
+                               var imageContent = new StreamContent (new MemoryStream ());
+
+                               var response = client.PostAsync (LocalServer, imageContent).Result;
+
+                               Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, "#101");
+                               Assert.AreEqual(false, failed, "#102");
+                       } finally {
+                               listener.Close ();
+                       }
+               }
+
+               [Test]
+#if FEATURE_NO_BSD_SOCKETS
+               [ExpectedException (typeof (PlatformNotSupportedException))]
+#endif
+               public void Post_StreamCaching ()
+               {
+                       bool? failed = null;
+                       var listener = CreateListener (l => {
+                               try {
+                                       var request = l.Request;
+
+                                       Assert.IsNull (request.AcceptTypes, "#1");
+                                       Assert.AreEqual (0, request.ContentLength64, "#2");
+                                       Assert.IsNull (request.ContentType, "#3");
+                                       Assert.AreEqual (0, request.Cookies.Count, "#4");
+                                       Assert.IsFalse (request.HasEntityBody, "#5");
+                                       Assert.AreEqual (TestHost, request.Headers ["Host"], "#6b");
+                                       Assert.AreEqual ("POST", request.HttpMethod, "#7");
+                                       Assert.IsFalse (request.IsAuthenticated, "#8");
+                                       Assert.IsTrue (request.IsLocal, "#9");
+                                       Assert.IsFalse (request.IsSecureConnection, "#10");
+                                       Assert.IsFalse (request.IsWebSocketRequest, "#11");
+                                       Assert.IsTrue (request.KeepAlive, "#12");
+                                       Assert.AreEqual (HttpVersion.Version11, request.ProtocolVersion, "#13");
+                                       Assert.IsNull (request.ServiceName, "#14");
+                                       Assert.IsNull (request.UrlReferrer, "#15");
+                                       Assert.IsNull (request.UserAgent, "#16");
+                                       Assert.IsNull (request.UserLanguages, "#17");
+                                       Assert.IsNull (request.Headers ["Transfer-Encoding"], "#18");
+                                       Assert.AreEqual ("0", request.Headers ["Content-Length"], "#19");
+                                       failed = false;
+                               } catch (Exception e) {
+                                       failed = true;
+                                       Console.WriteLine (e);
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+
+                               var imageContent = new StreamContent (new MemoryStream ());
+
+                               var response = client.PostAsync (LocalServer, imageContent).Result;
+
+                               Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, "#101");
+                               Assert.AreEqual(false, failed, "#102");
+                       } finally {
+                               listener.Close ();
+                       }
+               }
+
                [Test]
                [Category ("MobileNotWorking")] // Missing encoding
 #if FEATURE_NO_BSD_SOCKETS
index 1a7d41de48d6b5f4c38838283c41fa5d55f73142..2fdeb9969656bcd1bf22f81cebb0487603ef7f46 100644 (file)
@@ -1,5 +1,5 @@
 // This is a copy of external/referencesource/System.Runtime.Caching/Resources/R.Designer.cs
-// This verison does not use ResourceManager, instead it uses hard coded strings.
+// This version does not use ResourceManager, instead it uses hard coded strings.
 // This should be removed once Mono has access to .NET resources.
 
 namespace System.Runtime.Caching.Resources {
index c63b1781660d77a48c9dd8b8f77dc1aae07f7a8a..2533129e7e5682876c582442c9f229ca7386838a 100644 (file)
@@ -145,22 +145,33 @@ namespace System.Net.Sockets
 
                        IsCompleted = true;
 
+                       /* It is possible that this.socket is modified by this.Init which has been called by the callback. This
+                        * would lead to inconsistency, as we would for example not release the correct socket.ReadSem or
+                        * socket.WriteSem.
+                        * For example, this can happen with AcceptAsync followed by a ReceiveAsync on the same
+                        * SocketAsyncEventArgs */
+                       Socket completedSocket = socket;
+                       SocketOperation completedOperation = operation;
+
                        AsyncCallback callback = AsyncCallback;
                        if (callback != null) {
                                ThreadPool.UnsafeQueueUserWorkItem (_ => callback (this), null);
                        }
 
-                       switch (operation) {
+                       /* Warning: any field on the current SocketAsyncResult might have changed, as the callback might have
+                        * called this.Init */
+
+                       switch (completedOperation) {
                        case SocketOperation.Receive:
                        case SocketOperation.ReceiveFrom:
                        case SocketOperation.ReceiveGeneric:
                        case SocketOperation.Accept:
-                               socket.ReadSem.Release ();
+                               completedSocket.ReadSem.Release ();
                                break;
                        case SocketOperation.Send:
                        case SocketOperation.SendTo:
                        case SocketOperation.SendGeneric:
-                               socket.WriteSem.Release ();
+                               completedSocket.WriteSem.Release ();
                                break;
                        }
 
index 605948300d2018eec1892c2253505506cd2e3243..5397ec1fa33a4c43acae4fc9fc6553ac2b4a2ad0 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NETSTANDARD
-
 namespace System.Net.Sockets
 {
        public struct SocketReceiveFromResult
@@ -36,5 +34,3 @@ namespace System.Net.Sockets
                public EndPoint RemoteEndPoint;
        }
 }
-
-#endif
index f06b339949dd634490528d9dc9e81c5de0f55a1a..ba0ecca5b998c217ac16e988aa52ed771c0c463b 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NETSTANDARD
-
 namespace System.Net.Sockets
 {
        public struct SocketReceiveMessageFromResult
@@ -38,5 +36,3 @@ namespace System.Net.Sockets
                public IPPacketInformation PacketInformation;
        }
 }
-
-#endif
index 33bb55a7b0e4a93a5e861ffa0306a9fdcc459e68..aee91fd55e36f5c9a6190ef623c0766d107f1888 100644 (file)
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD
-
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -250,5 +248,3 @@ namespace System.Net.Sockets
         }
     }
 }
-
-#endif
index a12aa233b71643e260d48e1ed79834390f9d6de0..fc0125df25a8fbd10362b6bfb2acea030bcdfde9 100644 (file)
@@ -404,7 +404,7 @@ namespace System.Net {
                }
 
                public long ContentLength64 {
-                       get { return content_length; }
+                       get { return is_chunked ? -1 : content_length; }
                }
 
                public string ContentType {
index dcf83695f06517fa3d91dd10a1519d2bf7f5cf91..cb3827785af4dab4ced082075e03b608d27e1861 100644 (file)
@@ -14,6 +14,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading;
+using System.Runtime.InteropServices;
 
 using NUnit.Framework;
 
@@ -1130,5 +1131,60 @@ namespace MonoTests.System.Diagnostics
 
                        string v = Process.GetProcessById (1).ProcessName;
                }
+
+               [Test]
+               public void NonChildProcessWaitForExit ()
+               {
+                       if (!RunningOnUnix)
+                               Assert.Ignore ("accessing parent pid, only available on unix");
+
+                       using (Process process = Process.GetProcessById (getppid ()))
+                       using (ManualResetEvent mre = new ManualResetEvent (false))
+                       {
+                               Assert.IsFalse (process.WaitForExit (10), "#1");
+                               Assert.IsFalse (process.HasExited, "#2");
+                               Assert.Throws<InvalidOperationException>(delegate { int exitCode = process.ExitCode; }, "#3");
+
+                               process.Exited += (s, e) => mre.Set ();
+                               process.EnableRaisingEvents = true;
+                               Assert.IsFalse (mre.WaitOne (100), "#4");
+
+                               Assert.IsFalse (process.WaitForExit (10), "#5");
+                               Assert.IsFalse (process.HasExited, "#6");
+                               Assert.Throws<InvalidOperationException>(delegate { int exitCode = process.ExitCode; }, "#7");
+                       }
+               }
+
+               [Test]
+               public void NonChildProcessName ()
+               {
+                       if (!RunningOnUnix)
+                               Assert.Ignore ("accessing parent pid, only available on unix");
+
+                       using (Process process = Process.GetProcessById (getppid ()))
+                       {
+                               string pname = process.ProcessName;
+                               Assert.IsNotNull (pname, "#1");
+                               AssertHelper.IsNotEmpty (pname, "#2");
+                       }
+               }
+
+               [Test]
+               public void NonChildProcessId ()
+               {
+                       if (!RunningOnUnix)
+                               Assert.Ignore ("accessing parent pid, only available on unix");
+
+                       int ppid;
+                       using (Process process = Process.GetProcessById (ppid = getppid ()))
+                       {
+                               int pid = process.Id;
+                               Assert.AreEqual (ppid, pid, "#1");
+                               AssertHelper.Greater (pid, 0, "#2");
+                       }
+               }
+
+               [DllImport ("libc")]
+               static extern int getppid();
        }
 }
index 7a0851912ea37254f1112bfdf066d53932551903..6e82f9d6db81626de695abee6c8d6a34496b8425 100755 (executable)
@@ -4541,10 +4541,8 @@ namespace MonoTests.System.Net.Sockets
                                        mSent.Set ();
                                }, clientSocket);
 
-                               if (!mSent.WaitOne (1500))
-                                       throw new TimeoutException ();
-                               if (!mReceived.WaitOne (1500))
-                                       throw new TimeoutException ();
+                               Assert.IsTrue (mSent.WaitOne (5000), "#1");
+                               Assert.IsTrue (mReceived.WaitOne (5000), "#2");
                        } finally {
                                if (File.Exists (temp))
                                        File.Delete (temp);
@@ -4675,6 +4673,26 @@ namespace MonoTests.System.Net.Sockets
 
                        Assert.IsTrue (mre.WaitOne (1000), "ConnectedAsync timeout");
                }
+
+               [Test] // Covers https://bugzilla.xamarin.com/show_bug.cgi?id=52549
+               public void SocketMismatchProtocol ()
+               {
+                       try {
+                               using (Socket socket = new Socket (AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Tcp));
+                               Assert.Fail ("#1");
+                       } catch (SocketException e) {
+                               // Only work on OSX
+                               // Assert.AreEqual(SocketError.ProtocolType, e.SocketErrorCode, "#2");
+                       }
+
+                       try {
+                               using (Socket socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Udp));
+                               Assert.Fail ("#3");
+                       } catch (SocketException e) {
+                               // Only work on OSX
+                               // Assert.AreEqual(SocketError.ProtocolType, e.SocketErrorCode, "#4");
+                       }
+               }
        }
 }
 
index cacfcd60a0e71db89492364e99c1a12a26568d0c..b19688cf44cddcd6f2c9ada44d5259c8253967e0 100644 (file)
@@ -159,7 +159,11 @@ namespace MonoTests.System.Net.WebSockets
                [Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
                public void CloseAsyncTest ()
                {
-                       Assert.IsTrue (socket.ConnectAsync (new Uri (EchoServerUrl), CancellationToken.None).Wait (5000));
+                       if (!socket.ConnectAsync (new Uri (EchoServerUrl), CancellationToken.None).Wait (5000)) {
+                               Assert.Inconclusive (socket.State.ToString ());
+                               return;
+                       }
+
                        Assert.AreEqual (WebSocketState.Open, socket.State);
 
                        Assert.IsTrue (socket.CloseAsync (WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).Wait (5000));
@@ -167,11 +171,8 @@ namespace MonoTests.System.Net.WebSockets
                }
 
                [Test]
-#if FEATURE_NO_BSD_SOCKETS
-               [ExpectedException (typeof (PlatformNotSupportedException))]
-#else
                [ExpectedException (typeof (InvalidOperationException))]
-#endif
+               [Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
                public void SendAsyncArgTest_NotConnected ()
                {
                        socket.SendAsync (new ArraySegment<byte> (new byte[0]), WebSocketMessageType.Text, true, CancellationToken.None);
@@ -186,11 +187,8 @@ namespace MonoTests.System.Net.WebSockets
                }
 
                [Test]
-#if FEATURE_NO_BSD_SOCKETS
-               [ExpectedException (typeof (PlatformNotSupportedException))]
-#else
                [ExpectedException (typeof (InvalidOperationException))]
-#endif
+               [Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
                public void ReceiveAsyncArgTest_NotConnected ()
                {
                        socket.ReceiveAsync (new ArraySegment<byte> (new byte[0]), CancellationToken.None);
index 4cb362578ffc865092dfd2afd68af0c9e4151536..b71d5f1185b060e4e7a4145924c6abbc931a1078 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NETSTANDARD
-
 namespace System.Diagnostics.Tracing
 {
        public class EventCounter
@@ -41,5 +39,3 @@ namespace System.Diagnostics.Tracing
                }
        }
 }
-
-#endif
index bb1b719404a992efd5277abda3f6909cdecc3ede..5241e8c38b69eb4cfabcfc52e663e90076ebd543 100644 (file)
@@ -271,14 +271,12 @@ namespace System.Diagnostics.Tracing
                {
                }
 
-#if NETSTANDARD
                [MonoTODO]
                public event EventHandler<EventCommandEventArgs> EventCommandExecuted
                {
                        add { throw new NotImplementedException (); }
                        remove { throw new NotImplementedException (); }
                }
-#endif
 
                [MonoTODO]
                public static string GenerateManifest (Type eventSourceType, string assemblyPathToIncludeInManifest)
index adb9998e66ef4a999312c29926c33e762c4b8e3c..762dad80fd402117bf211eecb5528ad5902f89dd 100644 (file)
@@ -22,7 +22,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !FULL_AOT_RUNTIME || IOS_REFLECTION
 using System.Runtime.InteropServices;
 
 namespace System.Reflection.Emit {
@@ -35,5 +34,3 @@ namespace System.Reflection.Emit {
                WindowApplication = 3
        }
 }
-
-#endif
index 19da0435b5a9c2a9f84c2955bad869b98b9267c4..01f1d9583dc2f8ebbc4a99f8d9fc92266c0d02d1 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NETSTANDARD
-
 namespace System.Reflection.Metadata
 {
        public static class AssemblyExtensions
@@ -42,5 +40,3 @@ namespace System.Reflection.Metadata
                }
        }
 }
-
-#endif
\ No newline at end of file
index 3297ac2342a84dd961e621ae968f04260d124739..1e9b5c8dc6bd260b907be43ba567b09e88ba5263 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NETSTANDARD
-
 namespace System.Runtime.Loader
 {
        //
@@ -106,5 +104,3 @@ namespace System.Runtime.Loader
 #pragma warning restore
        }
 }
-
-#endif
\ No newline at end of file
index 960ecf6e7b857595371308d71456e4c2fe0dad93..3bd11264b1a8fd04c929d3e03b624fb743621c0b 100644 (file)
@@ -98,17 +98,16 @@ namespace System.Threading
 
                private void DoCallBack (object timedOut)
                {
-                       if (_callback != null) {
-                               try {
-                                       _callback (_state, (bool)timedOut); 
-                               } catch {}
-                       }
-
-                       lock (this) 
-                       {
-                               _callsInProcess--;
-                               if (_unregistered && _callsInProcess == 0 && _finalEvent != null)
-                                       NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
+                       try {
+                               if (_callback != null)
+                                       _callback (_state, (bool)timedOut);
+                       } finally {
+                               lock (this)
+                               {
+                                       _callsInProcess--;
+                                       if (_unregistered && _callsInProcess == 0 && _finalEvent != null)
+                                               NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
+                               }
                        }
                }
 
index 8f6e0aa098e40b238d2738503705207086c3eb80..d2565a3c209a771fa2ad03c1a5b423c87ea06d9c 100644 (file)
@@ -1290,6 +1290,34 @@ namespace System
                        }
                }
 
+               public static void Reverse<T>(T[] array)
+               {
+                       if (array == null)
+                               throw new ArgumentNullException (nameof (array));
+
+                       Reverse (array, 0, array.Length);
+               }
+
+               public static void Reverse<T>(T[] array, int index, int length)
+               {
+                       if (array == null)
+                               throw new ArgumentNullException (nameof (array));
+                       if (index < 0 || length < 0)
+                               throw new ArgumentOutOfRangeException ((index < 0 ? nameof (index) : nameof (length)));
+                       if (array.Length - index < length)
+                               throw new ArgumentException ();
+
+                       int i = index;
+                       int j = index + length - 1;
+                       while (i < j) {
+                               T temp = array [i];
+                               array [i] = array [j];
+                               array [j] = temp;
+                               i++;
+                               j--;
+                       }
+               }
+
                [ReliabilityContractAttribute (Consistency.MayCorruptInstance, Cer.MayFail)]
                public static void Sort (Array array)
                {
@@ -3130,6 +3158,30 @@ namespace System
                        return new ReadOnlyCollection<T> (array);
                }
 
+               public static void Fill<T> (T[] array, T value)
+               {
+                       if (array == null)
+                               throw new ArgumentNullException (nameof (array));
+
+                       for (int i = 0; i < array.Length; i++)
+                               array [i] = value;
+               }
+
+               public static void Fill<T> (T[] array, T value, int startIndex, int count)
+               {
+                       if (array == null)
+                               throw new ArgumentNullException (nameof (array));
+
+                       if (startIndex < 0 || startIndex > array.Length)
+                               throw new ArgumentOutOfRangeException (nameof (startIndex));
+
+                       if (count < 0 || startIndex > array.Length - count)
+                               throw new ArgumentOutOfRangeException (nameof (count));
+
+                       for (int i = startIndex; i < startIndex + count; i++)
+                               array [i] = value;
+               }
+
                public static T Find<T> (T [] array, Predicate<T> match)
                {
                        if (array == null)
index ae5bdbfd586d3391d656861047590897068957ca..a84fa27a77d742a5faaebda98b46758d2bff70e6 100644 (file)
@@ -912,20 +912,18 @@ namespace MonoTests.System.Threading
                [Test]
                public void SetNameInThreadPoolThread ()
                {
-                       for (int i = 0; i < 10; ++i) {
-                               Task t = Task.Run (delegate () {
-                                       Thread.CurrentThread.Name = "x/" + i;
-                                       Assert.AreEqual (Thread.CurrentThread.Name, "x/" + i, "#1");
+                       Task t = Task.Run (delegate () {
+                               Thread.CurrentThread.Name = "ThreadName1";
+                               Assert.AreEqual (Thread.CurrentThread.Name, "ThreadName1", "#1");
 
-                                       try {
-                                               Thread.CurrentThread.Name = "y/" + i;
-                                               Assert.Fail ("#2");
-                                       } catch (InvalidOperationException) {
-                                       }
-                               });
+                               try {
+                                       Thread.CurrentThread.Name = "ThreadName2";
+                                       Assert.Fail ("#2");
+                               } catch (InvalidOperationException) {
+                               }
+                       });
 
-                               t.Wait ();
-                       }
+                       t.Wait ();
                }
 
                void CheckIsRunning (string s, Thread t)
index ce1c9793fc57daeef63df5687cbea2c505ac916d..b9ae6d1709ad07c3bd99073e4271bb4947271360 100644 (file)
@@ -19,6 +19,7 @@ namespace MonoTests.System.Threading {
                // this bucket is used to avoid non-theadlocal issues
                class Bucket {
                        public int count;
+                       public ManualResetEventSlim mre = new ManualResetEventSlim (false); 
                }
 
                [SetUp]
@@ -36,37 +37,52 @@ namespace MonoTests.System.Threading {
                {
                }
 
+               private void Callback2 (object foo)
+               {
+                       Bucket b = foo as Bucket;
+                       Interlocked.Increment (ref b.count);
+                       b.mre.Set ();
+               }
+
+
                [Test]
                public void TestDueTime ()
                {
                        Bucket bucket = new Bucket();
 
-                       using (Timer t = new Timer (o => Callback (o), bucket, 200, Timeout.Infinite)) {
-                               Thread.Sleep (50);
-                               Assert.AreEqual (0, bucket.count, "#1");
-                               Thread.Sleep (200);
-                               Assert.AreEqual (1, bucket.count, "#2");
-                               Thread.Sleep (500);
-                               Assert.AreEqual (1, bucket.count, "#3");
-                               t.Change (10, 10);
-                               Thread.Sleep (1000);
-                               Assert.IsTrue(bucket.count > 20, "#4");
+                       using (Timer t = new Timer (o => Callback2 (o), bucket, 200, Timeout.Infinite)) {
+                               Assert.IsTrue (bucket.mre.Wait (5000), "#-1");
+                               Assert.AreEqual (1, bucket.count, "#1");
                        }
                }
 
+               [Test]
+               public void TestDispose ()
+               {       
+                       Bucket bucket = new Bucket();
+
+                       using (Timer t = new Timer (o => Callback2 (o), bucket, 10, 10)) {
+                               Assert.IsTrue (bucket.mre.Wait (5000), "#-1");
+                       }
+                       //If the callback is called after dispose, it will NRE and be reported
+                       bucket.mre = null;
+                       int c = bucket.count;
+                       Assert.IsTrue (c > 0, "#1");
+               }
+
                [Test]
                public void TestChange ()
                {
                        Bucket bucket = new Bucket();
 
-                       using (Timer t = new Timer (o => Callback (o), bucket, 10, 10)) {
-                               Thread.Sleep (500);
+                       using (Timer t = new Timer (o => Callback2 (o), bucket, 10, 10)) {
+                               Assert.IsTrue (bucket.mre.Wait (5000), "#-1");
                                int c = bucket.count;
-                               Assert.IsTrue (c > 20, "#1 " + c.ToString ());
-                               t.Change (100, 100);
+                               Assert.IsTrue (c > 0, "#1 " + c);
+                               t.Change (100000, 1000000);
                                c = bucket.count;
                                Thread.Sleep (500);
-                               Assert.IsTrue (bucket.count <= c + 20, "#2 " + c.ToString ());
+                               Assert.IsTrue (bucket.count <= c + 1, "#2 " + c);
                        }
                }
 
@@ -75,31 +91,16 @@ namespace MonoTests.System.Threading {
                {
                        Bucket bucket = new Bucket();
 
-                       using (Timer t = new Timer (o => Callback (o), bucket, 0, Timeout.Infinite)) {
-                               Thread.Sleep (100);
+                       using (Timer t = new Timer (o => Callback2 (o), bucket, 0, Timeout.Infinite)) {
+                               Assert.IsTrue (bucket.mre.Wait (5000), "#-1");
+                               bucket.mre.Reset ();
                                Assert.AreEqual (1, bucket.count, "#1");
                                t.Change (0, Timeout.Infinite);
-                               Thread.Sleep (100);
+                               Assert.IsTrue (bucket.mre.Wait (5000), "#1.5");
                                Assert.AreEqual (2, bucket.count, "#2");
                        }
                }
 
-               [Test]
-               public void TestDispose ()
-               {       
-                       Bucket bucket = new Bucket();
-
-                       using (Timer t = new Timer (o => Callback (o), bucket, 10, 10)) {
-                               Thread.Sleep (200);
-                       }
-
-                       Thread.Sleep (20);
-                       int c = bucket.count;
-                       Assert.IsTrue (bucket.count > 5, "#1");
-                       Thread.Sleep (200);
-                       Assert.AreEqual (c, bucket.count, "#2");
-               }
-
                [Test] // bug #320950
                public void TestDispose2 ()
                {
index 6ce65b4b432018862fbbef3c5a45cb9d2d2db94a..59d50b92845a3700771805437d2708be9c4b7eff 100644 (file)
@@ -27,6 +27,7 @@
 //
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 using NUnit.Framework;
@@ -57,7 +58,10 @@ namespace MonoTests.System {
                [Test]
                public void ReRegisterForFinalizeTest ()
                {
-                       Run_ReRegisterForFinalizeTest ();
+                       var thread =  new Thread (Run_ReRegisterForFinalizeTest);
+                       thread.Start ();
+                       thread.Join ();
+
                        var t = Task.Factory.StartNew (() => {
                                do {
                                        GC.Collect ();
index 3e70f3f8c7decb7165936e0dfecd27c366703d76..1318e3550a6db9eb21452141acb3f93af9617dfb 100644 (file)
@@ -139,12 +139,10 @@ namespace System.Linq.Expressions {
             return LambdaCompiler.Compile(this, debugInfoGenerator);
         }
 
-#if NETSTANDARD
         public Delegate Compile(bool preferInterpretation) {
             // TODO: add logic for preferInterpretation
             return Compile();
         }
-#endif
 
         /// <summary>
         /// Compiles the lambda into a method definition.
@@ -207,12 +205,10 @@ namespace System.Linq.Expressions {
             return (TDelegate)(object)LambdaCompiler.Compile(this, debugInfoGenerator);
         }
 
-#if NETSTANDARD
         public new TDelegate Compile(bool preferInterpretation) {
             // TODO: add logic for preferInterpretation
             return Compile();
         }
-#endif
 
         /// <summary>
         /// Creates a new expression that is like this one, but using the
index 373609195c25680febccfacc678a393fa3cfeb06..d1dc03000a9f0b6357a67dd3f7b9c72da5e9be1a 100644 (file)
@@ -694,7 +694,6 @@ namespace System.Linq
             foreach (TSource element in second) yield return element;
         }
 
-#if NETSTANDARD
         public static IEnumerable<TSource> Append<TSource>(this IEnumerable<TSource> source, TSource element)
         {
             if (source == null) throw Error.ArgumentNull("source");
@@ -718,7 +717,6 @@ namespace System.Linq
             yield return element;
             foreach (TSource e1 in source) yield return e1;
         }
-#endif
 
         public static IEnumerable<TResult> Zip<TFirst, TSecond, TResult>(this IEnumerable<TFirst> first, IEnumerable<TSecond> second, Func<TFirst, TSecond, TResult> resultSelector) {
             if (first == null) throw Error.ArgumentNull("first");
index 55e173b3542badb18b08af2c5308bbe8c8e4a400..5cfafbab8874ece62523d9b5d9ca0795501987c4 100644 (file)
@@ -242,7 +242,6 @@ namespace System.Security.Cryptography {
             }
         }
 
-#if NETSTANDARD
         public static CngAlgorithm ECDiffieHellman {
             get {
                 throw new NotImplementedException ();
@@ -254,6 +253,5 @@ namespace System.Security.Cryptography {
                 throw new NotImplementedException ();
             }
         }
-#endif
     }
 }
index 6592635e850ebd0fac3eb658c01244722426e99a..8ee5e598f41d662afd7ade5de742bca5ffb20547 100644 (file)
@@ -119,7 +119,6 @@ namespace System.Security.Cryptography {
             }
         }
 
-#if NETSTANDARD
         public static CngKeyBlobFormat EccFullPrivateBlob {
             get {
                 throw new NotImplementedException ();
@@ -131,7 +130,6 @@ namespace System.Security.Cryptography {
                 throw new NotImplementedException ();
             }
         }
-#endif
 
         public static CngKeyBlobFormat GenericPrivateBlob {
             get {
index 79202306c85226934f4be7a334f6ffd7c7be5ad2..04f11603a17954cdd8a8f3d6c32be367f8c70c65 100644 (file)
@@ -41,7 +41,6 @@ namespace System.Security.Cryptography {
             return CryptoConfig.CreateFromName(algorithm) as ECDsa;
         }
 
-#if NETSTANDARD
         public static ECDsa Create (ECCurve curve)
         {
             throw new NotImplementedException ();
@@ -71,7 +70,6 @@ namespace System.Security.Cryptography {
         {
             throw new NotImplementedException ();
         }
-#endif
 
         //
         // Signature operations
index ec51a5c6653a1842a70a4e1abd92b39506c56a87..b0267ab9983b832e9bd385c318469aa00218336f 100644 (file)
@@ -31,11 +31,9 @@ namespace System.Security.Cryptography {
             throw new NotImplementedException ();
         }
 
-#if NETSTANDARD
         public ECDsaCng(ECCurve curve) {
             throw new NotImplementedException ();
         }
-#endif
 
         public CngKey Key {
             get {
index 78764bb468033653fb802d0a842c0913176993a3..ca99748e84c73add118aad5e1e94a9a983481e4b 100644 (file)
@@ -18,12 +18,10 @@ namespace System.Security.Cryptography
             throw new NotImplementedException ();
         }
 
-#if NETSTANDARD
         public RSACng(CngKey key)
         {
             throw new NotImplementedException ();
         }
-#endif
 
         public CngKey Key
         {
index 62eb1dcc3f870757e03d70d408281fbd5f2dad9e..7fcf6f07ab366112bb4c983199863ae276f13591 100644 (file)
@@ -13,6 +13,7 @@ namespace System.Data {
     using System.Data;
     using System.Runtime.Serialization;
 
+#if !COREFX
     /// <devdoc>
     ///    <para>DEV: The exception that is throwing from strong typed DataSet when user access to DBNull value.</para>
     /// </devdoc>
@@ -39,7 +40,7 @@ namespace System.Data {
             HResult = HResults.StrongTyping;
         }
     }
-
+#endif
 
     /// <devdoc>
     ///    <para>DEV: The exception that is throwing in generating strong typed DataSet when name conflict happens.</para>
index 1e5ea43e2710b9e2f6698d8b679b66e4c28040a4..32bc1e964e2ce57e1305e48a1772c2add589af41 100644 (file)
@@ -55,6 +55,8 @@ namespace System.Data.Common {
         // The resource Framework.txt will ensure proper string text based on the appropriate
         // locale.
 
+        public const CompareOptions DefaultCompareOptions = CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
+
         static internal Task<T> CreatedTaskWithException<T>(Exception ex) {
             TaskCompletionSource<T> completion = new TaskCompletionSource<T>();
             completion.SetException(ex);
@@ -77,27 +79,9 @@ namespace System.Data.Common {
             }
         }
 
-        // NOTE: Initializing a Task in SQL CLR requires the "UNSAFE" permission set (http://msdn.microsoft.com/en-us/library/ms172338.aspx)
-        // Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features (See Dev11 Bug #193253)
-        static private Task<bool> _trueTask = null;
-        static internal Task<bool> TrueTask {
-            get {
-                if (_trueTask == null) {
-                    _trueTask = Task.FromResult<bool>(true);
-                }
-                return _trueTask;
-            }
-        }
+        static internal Task<bool> s_trueTask = Task.FromResult<bool>(true);
 
-        static private Task<bool> _falseTask = null;
-        static internal Task<bool> FalseTask {
-            get {
-                if (_falseTask == null) {
-                    _falseTask = Task.FromResult<bool>(false);
-                }
-                return _falseTask;
-            }
-        }
+        static internal Task<bool> s_falseTask = Task.FromResult<bool>(true);
         
         [BidMethod] // this method accepts BID format as an argument, this attribute allows FXCopBid rule to validate calls to it
         static private void TraceException(
index ed7b7b4c5d1c02ff0fba43ea712a1a476c508c9a..e2e362e7a24bdd10327ec3eb06d224930d01df11 100644 (file)
@@ -86,7 +86,7 @@ namespace System.Data.Common {
             _encryptedUsersConnectionString = connectionOptions.UsersConnectionString(false);
             _hasPassword = connectionOptions.HasPasswordKeyword;
             _parsetable = connectionOptions.Parsetable;
-            _keychain = connectionOptions.KeyChain;
+            _keychain = connectionOptions._keyChain;
 
             // we do not want to serialize out user password unless directed so by "persist security info=true"
             // otherwise all instances of user's password will be replaced with "*"
index 11257cc6dea9b8de67dbe9f4e2c387041bb40660..6f283876b38dc2f30734294825f5937e3869e781 100644 (file)
@@ -107,7 +107,7 @@ namespace System.Data.Common {
 
         private readonly string        _usersConnectionString;
         private readonly Hashtable     _parsetable;
-        internal readonly NameValuePair KeyChain;
+        internal readonly NameValuePair _keyChain;
         internal readonly bool HasPasswordKeyword;
         internal readonly bool HasUserIdKeyword;
 
@@ -143,7 +143,7 @@ namespace System.Data.Common {
 
             // first pass on parsing, initial syntax check
             if (0 < _usersConnectionString.Length) {
-                KeyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, UseOdbcRules);
+                _keyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, UseOdbcRules);
                 HasPasswordKeyword = (_parsetable.ContainsKey(KEY.Password) || _parsetable.ContainsKey(SYNONYM.Pwd));
                 HasUserIdKeyword = (_parsetable.ContainsKey(KEY.User_ID) || _parsetable.ContainsKey(SYNONYM.UID));
             }
@@ -155,7 +155,7 @@ namespace System.Data.Common {
             HasUserIdKeyword = connectionOptions.HasUserIdKeyword;
             UseOdbcRules = connectionOptions.UseOdbcRules;
             _parsetable = connectionOptions._parsetable;
-            KeyChain = connectionOptions.KeyChain;
+            _keyChain = connectionOptions._keyChain;
         }
 
 
@@ -201,7 +201,7 @@ namespace System.Data.Common {
         }
 
         public bool IsEmpty {
-            get { return (null == KeyChain); }
+            get { return (null == _keyChain); }
         }
 
         internal Hashtable Parsetable {
@@ -439,7 +439,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
             bool expanded = false;
 
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 value = current.Value;
 
                 // remove duplicate keyswords from connectionstring
@@ -517,7 +517,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
 
             StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 if ((current.Name == keyword) && (current.Value == this[keyword])) {
                     // only replace the parse end-result value instead of all values
                     // so that when duplicate-keywords occur other original values remain in place
@@ -929,7 +929,7 @@ namespace System.Data.Common {
             int copyPosition = 0;
             NameValuePair head = null, tail = null, next = null;
             StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
-            for(NameValuePair current = KeyChain; null != current; current = current.Next) {
+            for(NameValuePair current = _keyChain; null != current; current = current.Next) {
                 if ((KEY.Password != current.Name) && (SYNONYM.Pwd != current.Name)) {
                     builder.Append(_usersConnectionString, copyPosition, current.Length);
                     if (fakePassword) {
index c95844c82a82efbecd9aba0a91827f07157dfdc3..9646eb88b49a320cae96980114160abb2fc7f1eb 100644 (file)
@@ -262,7 +262,7 @@ internal static partial class Bid
     [BidMethod]
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1) {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, actId.ToString());
@@ -273,7 +273,7 @@ internal static partial class Bid
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW)
     {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, actId.ToString());
@@ -283,7 +283,7 @@ internal static partial class Bid
     [BidMethod]
     [BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
     internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1, System.Int32 a2) {
-        if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
+        if ((modFlags & Bid.ApiGroup.Correlation) != 0
             && (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
             System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
             NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, a2, actId.ToString());
index eb8d46d665f2ecc7389528bf84f1f2e211424909..2a88477ebb7106342eac3e23b62d255ecd892b31 100644 (file)
@@ -227,6 +227,22 @@ namespace System.Collections.Generic {
             _array[_size] = default(T);     // Free memory quicker.
             return item;
         }
+
+#if MONO
+        public bool TryPop(out T result)
+        {
+            if (_size == 0)
+            {
+                result = default(T);
+                return false;
+            }
+
+            _version++;
+            result = _array[--_size];
+            _array[_size] = default(T);     // Free memory quicker.
+            return true;
+        }
+#endif
     
         // Pushes an item to the top of the stack.
         // 
index 7ee9e5355447cb061ce177d92c1f1ccaed1de71b..a978e8e73ab7a590ce9e510bb6de9c7291917ca5 100644 (file)
@@ -472,7 +472,6 @@ namespace System.Text.RegularExpressions {
             }
         }
 
-#if NETSTANDARD
         [CLSCompliant (false)]
         protected IDictionary Caps
         {
@@ -527,7 +526,6 @@ namespace System.Text.RegularExpressions {
                 }
             }
         }
-#endif
 
         /// <devdoc>
         ///    <para>
index 48b508d50de2970bf5ccd25d8a6fa9c1b55b9447..a2fec93aa83a2cf51db3652a3158783d2efd1d4b 100644 (file)
@@ -33,7 +33,6 @@ namespace System
             }
         }
 
-#if NETSTANDARD
         public static string TargetFrameworkName
         {
             get
@@ -46,7 +45,6 @@ namespace System
         {
             throw new NotImplementedException();
         }
-#endif
 
         #region Switch APIs
 #if !MONO
index e5d0b1f173584fe1676d1379efa1df8a35346731..fe79b444e36e6600d1a1b227e831fe5a3d278c1b 100644 (file)
@@ -1443,7 +1443,11 @@ namespace Mono.CSharp
                                        targs.Arguments = new TypeSpec[hoisted_tparams.Length];
                                        for (int i = 0; i < hoisted_tparams.Length; ++i) {
                                                var tp = hoisted_tparams[i];
-                                               var local_tp = new TypeParameter (tp, null, new MemberName (tp.Name, Location), null);
+                                               var tp_name = tp.Name;
+#if DEBUG
+                                               tp_name += "_Proxy";
+#endif
+                                               var local_tp = new TypeParameter (tp, null, new MemberName (tp_name, Location), null);
                                                tparams.Add (local_tp);
 
                                                targs.Add (new SimpleName (tp.Name, Location));
@@ -1459,6 +1463,12 @@ namespace Mono.CSharp
                                        var mutator = new TypeParameterMutator (hoisted_tparams, tparams);
                                        return_type = mutator.Mutate (return_type);
                                        local_param_types = mutator.Mutate (local_param_types);
+
+                                       var inflator = new TypeParameterInflator (this, null, hoisted_tparams, targs.Arguments);
+                                       for (int i = 0; i < hoisted_tparams.Length; ++i) {
+                                               var tp_spec = (TypeParameterSpec) targs.Arguments [i];
+                                               tp_spec.InflateConstraints (inflator, tp_spec);
+                                       }
                                } else {
                                        member_name = new MemberName (name);
                                }
@@ -1471,7 +1481,7 @@ namespace Mono.CSharp
                                        base_parameters[i].Resolve (this, i);
                                }
 
-                               var cloned_params = ParametersCompiled.CreateFullyResolved (base_parameters, method.Parameters.Types);
+                               var cloned_params = ParametersCompiled.CreateFullyResolved (base_parameters, local_param_types);
                                if (method.Parameters.HasArglist) {
                                        cloned_params.FixedParameters[0] = new Parameter (null, "__arglist", Parameter.Modifier.NONE, null, Location);
                                        cloned_params.Types[0] = Module.PredefinedTypes.RuntimeArgumentHandle.Resolve ();
index d5ba75c12813af9d07e4b3182134f82cc3e557f9..c580a8a7291562eeeb31b519ece86ec395d146b7 100644 (file)
@@ -1070,7 +1070,10 @@ namespace Mono.CSharp
                                        var ie = new InstanceEmitter (instance_copy, IsAddressCall (instance_copy, call_op, method.DeclaringType));
 
                                        if (Arguments == null) {
-                                               ie.EmitLoad (ec, true);
+                                               if (ConditionalAccess)
+                                                       ie.Emit (ec, true);
+                                               else
+                                                       ie.EmitLoad (ec, true);
                                        }
                                } else if (!InstanceExpressionOnStack) {
                                        var ie = new InstanceEmitter (InstanceExpression, IsAddressCall (InstanceExpression, call_op, method.DeclaringType));
index 8475a9e489428c0d98d91267b7b40954a54be3c2..5dff5e73d79361861f97b7d05bbd45432db84ac4 100644 (file)
@@ -3352,6 +3352,8 @@ namespace Mono.CSharp {
                                // introduce redundant storey but with `this' only but it's tricky to avoid
                                // at this stage as we don't know what expressions follow base
                                //
+                               // TODO: It's needed only when the method with base call is moved to a storey
+                               //
                                if (rc.CurrentAnonymousMethod != null) {
                                        if (targs == null && method.IsGeneric) {
                                                targs = method.TypeArguments;
index 2968ee08584f544f7869efba43e4007b9f259888..c7747f014fdee5da31e0b772c45dbdaa148c769c 100644 (file)
@@ -3448,7 +3448,7 @@ namespace Mono.CSharp
                        }
                }
 
-               static CSharp.Operator.OpType ConvertBinaryToUserOperator (Operator op)
+               public static CSharp.Operator.OpType ConvertBinaryToUserOperator (Operator op)
                {
                        switch (op) {
                        case Operator.Addition:
@@ -12174,21 +12174,23 @@ namespace Mono.CSharp
                                args);
                }
 
-               protected override Expression DoResolve (ResolveContext ec)
+               protected override Expression DoResolve (ResolveContext rc)
                {
-                       Expression e = base.DoResolve (ec);
+                       Expression e = base.DoResolve (rc);
                        if (type == null)
                                return null;
 
                        if (type.IsDelegate) {
-                               ec.Report.Error (1958, Initializers.Location,
+                               rc.Report.Error (1958, Initializers.Location,
                                        "Object and collection initializers cannot be used to instantiate a delegate");
                        }
 
-                       Expression previous = ec.CurrentInitializerVariable;
-                       ec.CurrentInitializerVariable = new InitializerTargetExpression (this);
-                       initializers.Resolve (ec);
-                       ec.CurrentInitializerVariable = previous;
+                       Expression previous = rc.CurrentInitializerVariable;
+                       rc.CurrentInitializerVariable = new InitializerTargetExpression (this);
+                       using (rc.With (ResolveContext.Options.DontSetConditionalAccessReceiver, false)) {
+                               initializers.Resolve (rc);
+                       }
+                       rc.CurrentInitializerVariable = previous;
 
                        dynamic = e as DynamicExpressionStatement;
                        if (dynamic != null)
index fdf5b81f92c38a4ef8dba73e5c202a990383eec3..8ddef4f36947b630ee655efd11adbe80fa385b5c 100644 (file)
@@ -428,13 +428,13 @@ namespace Mono.CSharp {
                public TypeParameter (TypeParameterSpec spec, TypeSpec parentSpec, MemberName name, Attributes attrs)
                        : base (null, name, attrs)
                {
-                       this.spec = new TypeParameterSpec (parentSpec, spec.DeclaredPosition, spec.MemberDefinition, spec.SpecialConstraint, spec.Variance, null) {
+                       this.spec = new TypeParameterSpec (parentSpec, spec.DeclaredPosition, this, spec.SpecialConstraint, spec.Variance, null) {
                                BaseType = spec.BaseType,
                                InterfacesDefined = spec.InterfacesDefined,
                                TypeArguments = spec.TypeArguments
                        };
                }
-               
+
                #region Properties
 
                public override AttributeTargets AttributeTargets {
@@ -2162,6 +2162,10 @@ namespace Mono.CSharp {
                                return this;
 
                        var mutated = (InflatedTypeSpec) MemberwiseClone ();
+#if DEBUG
+                       mutated.ID += 1000000;
+#endif
+
                        if (decl != DeclaringType) {
                                // Gets back MethodInfo in case of metaInfo was inflated
                                //mutated.info = MemberCache.GetMember<TypeSpec> (DeclaringType.GetDefinition (), this).info;
index d3b0f86d8164bd2338d66fe6ca7a8df689bf07cc..a3220630bd5495f2eb493e063c9e85643875b7f7 100644 (file)
@@ -373,8 +373,13 @@ namespace Mono.CSharp {
                                        var entry_pm = entry as IParametersMember;
                                        if (entry_pm != null) {
                                                entry_param = entry_pm.Parameters;
-                                               if (!TypeSpecComparer.Override.IsEqual (entry_param, member_param))
-                                                       continue;
+                                               if (entry.DeclaringType != member.DeclaringType) {
+                                                       if (!TypeSpecComparer.Override.IsEqual (entry_param, member_param))
+                                                               continue;
+                                               } else {
+                                                       if (!TypeSpecComparer.Equals (entry_param, member_param))
+                                                               continue;
+                                               }
                                        }
                                }
 
index 5cce6a10361339e95669211d7dceaa38065f5afd..c2b993564e2b354b066ca651e60f816da3707d00 100644 (file)
@@ -444,6 +444,10 @@ namespace Mono.CSharp {
                        return ms;
                }
 
+#if DEBUG
+               int counter = 100000;
+#endif
+
                public MethodSpec MakeGenericMethod (IMemberContext context, params TypeSpec[] targs)
                {
                        if (targs == null)
@@ -465,6 +469,10 @@ namespace Mono.CSharp {
                        inflated.constraints = TypeParameterSpec.InflateConstraints (inflator, constraints ?? GenericDefinition.TypeParameters);
                        inflated.state |= StateFlags.PendingMakeMethod;
 
+#if DEBUG
+                       inflated.ID += counter;
+                       counter += 100000;
+#endif
                        //                      if (inflated.parent == null)
                        //                              inflated.parent = parent;
 
@@ -1867,6 +1875,7 @@ namespace Mono.CSharp {
                        if (debug_builder == null)
                                return;
 
+#if !FULL_AOT_RUNTIME
                        var token = ConstructorBuilder.GetToken ();
                        int t = token.Token;
 #if STATIC
@@ -1875,6 +1884,7 @@ namespace Mono.CSharp {
 #endif
 
                        debug_builder.DefineMethod (file, t);
+#endif
                }
 
                #region IMethodData Members
@@ -2197,6 +2207,7 @@ namespace Mono.CSharp {
                        if (debug_builder == null)
                                return;
 
+#if !FULL_AOT_RUNTIME
                        var token = builder.GetToken ();
                        int t = token.Token;
 #if STATIC
@@ -2205,6 +2216,7 @@ namespace Mono.CSharp {
 #endif
 
                        debug_builder.DefineMethod (file, t);
+#endif
                }
        }
 
index 93314df322ad9c202cbc1667077a1f050738f27e..754c888e8b1158711b9f4200666e7a22e6ff273f 100644 (file)
@@ -695,6 +695,20 @@ namespace Mono.CSharp.Nullable
                                        Right = Unwrap.CreateUnwrapped (Right);
                                        UnwrapRight = Right as Unwrap;
                                }
+
+                               if (Left.Type.BuiltinType == BuiltinTypeSpec.Type.Decimal) {
+                                       var decimal_operators = MemberCache.GetUserOperator (Left.Type, Binary.ConvertBinaryToUserOperator (Binary.Oper), false);
+
+                                       Arguments args = new Arguments (2);
+                                       args.Add (new Argument (Left));
+                                       args.Add (new Argument (Right));
+
+                                       const OverloadResolver.Restrictions restr = OverloadResolver.Restrictions.ProbingOnly |
+                                               OverloadResolver.Restrictions.NoBaseMembers | OverloadResolver.Restrictions.BaseMembersIncluded;
+
+                                       var res = new OverloadResolver (decimal_operators, restr, loc);
+                                       UserOperator = res.ResolveOperator (rc, ref args);
+                               }
                        }
 
                        type = Binary.Type;
index fbb060f52960da9af8218171c9cf6991e8b102cc..4f67eb3240f38407e24a36fc3c384b3f60714489 100644 (file)
@@ -1301,7 +1301,7 @@ namespace Mono.CSharp {
                                                // Special case hoisted return value (happens in try/finally scenario)
                                                //
                                                if (ec.TryFinallyUnwind != null) {
-                                                       exit_label = TryFinally.EmitRedirectedReturn (ec, async_body);
+                                                       exit_label = TryFinally.EmitRedirectedReturn (ec, async_body, unwind_protect);
                                                }
 
                                                var async_return = (IAssignMethod)storey.HoistedReturnValue;
@@ -1311,7 +1311,7 @@ namespace Mono.CSharp {
                                                expr.Emit (ec);
 
                                                if (ec.TryFinallyUnwind != null)
-                                                       exit_label = TryFinally.EmitRedirectedReturn (ec, async_body);
+                                                       exit_label = TryFinally.EmitRedirectedReturn (ec, async_body, unwind_protect);
                                        }
 
                                        ec.Emit (OpCodes.Leave, exit_label);
@@ -1460,7 +1460,7 @@ namespace Mono.CSharp {
 
                        if (ec.TryFinallyUnwind != null && IsLeavingFinally (label.Block)) {
                                var async_body = (AsyncInitializer) ec.CurrentAnonymousMethod;
-                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, label.Block);
+                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, label.Block, unwind_protect);
                        }
 
                        ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, l);
@@ -1867,7 +1867,7 @@ namespace Mono.CSharp {
 
                        if (ec.TryFinallyUnwind != null) {
                                var async_body = (AsyncInitializer) ec.CurrentAnonymousMethod;
-                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, enclosing_loop.Statement as Block);
+                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, enclosing_loop.Statement as Block, unwind_protect);
                        }
 
                        ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, l);
@@ -1915,7 +1915,7 @@ namespace Mono.CSharp {
 
                        if (ec.TryFinallyUnwind != null) {
                                var async_body = (AsyncInitializer) ec.CurrentAnonymousMethod;
-                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, enclosing_loop.Statement as Block);
+                               l = TryFinally.EmitRedirectedJump (ec, async_body, l, enclosing_loop.Statement as Block, unwind_protect);
                        }
 
                        ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, l);
@@ -6997,7 +6997,7 @@ namespace Mono.CSharp {
        {
                ExplicitBlock fini;
                List<DefiniteAssignmentBitSet> try_exit_dat;
-               List<Label> redirected_jumps;
+               List<Tuple<Label, bool>> redirected_jumps;
                Label? start_fin_label;
 
                public TryFinally (Statement stmt, ExplicitBlock fini, Location loc)
@@ -7123,7 +7123,7 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               public static Label EmitRedirectedJump (EmitContext ec, AsyncInitializer initializer, Label label, Block labelBlock)
+               public static Label EmitRedirectedJump (EmitContext ec, AsyncInitializer initializer, Label label, Block labelBlock, bool unwindProtect)
                {
                        int idx;
                        if (labelBlock != null) {
@@ -7143,7 +7143,7 @@ namespace Mono.CSharp {
                                if (labelBlock != null && !fin.IsParentBlock (labelBlock))
                                        break;
 
-                               fin.EmitRedirectedExit (ec, label, initializer, set_return_state);
+                               fin.EmitRedirectedExit (ec, label, initializer, set_return_state, unwindProtect);
                                set_return_state = false;
 
                                if (fin.start_fin_label == null) {
@@ -7156,26 +7156,26 @@ namespace Mono.CSharp {
                        return label;
                }
 
-               public static Label EmitRedirectedReturn (EmitContext ec, AsyncInitializer initializer)
+               public static Label EmitRedirectedReturn (EmitContext ec, AsyncInitializer initializer, bool unwindProtect)
                {
-                       return EmitRedirectedJump (ec, initializer, initializer.BodyEnd, null);
+                       return EmitRedirectedJump (ec, initializer, initializer.BodyEnd, null, unwindProtect);
                }
 
-               void EmitRedirectedExit (EmitContext ec, Label label, AsyncInitializer initializer, bool setReturnState)
+               void EmitRedirectedExit (EmitContext ec, Label label, AsyncInitializer initializer, bool setReturnState, bool unwindProtect)
                {
                        if (redirected_jumps == null) {
-                               redirected_jumps = new List<Label> ();
+                               redirected_jumps = new List<Tuple<Label, bool>> ();
 
                                // Add fallthrough label
-                               redirected_jumps.Add (ec.DefineLabel ());
+                               redirected_jumps.Add (Tuple.Create (ec.DefineLabel (), false));
 
                                if (setReturnState)
                                        initializer.HoistedReturnState = ec.GetTemporaryField (ec.Module.Compiler.BuiltinTypes.Int, true);
                        }
 
-                       int index = redirected_jumps.IndexOf (label);
+                       int index = redirected_jumps.FindIndex (l => l.Item1 == label);
                        if (index < 0) {
-                               redirected_jumps.Add (label);
+                               redirected_jumps.Add (Tuple.Create (label, unwindProtect));
                                index = redirected_jumps.Count - 1;
                        }
 
@@ -7199,10 +7199,34 @@ namespace Mono.CSharp {
 
                        var initializer = (AsyncInitializer)ec.CurrentAnonymousMethod;
                        initializer.HoistedReturnState.EmitLoad (ec);
-                       ec.Emit (OpCodes.Switch, redirected_jumps.ToArray ());
+
+                       var jumps_table = new Label [redirected_jumps.Count];
+                       List<Tuple<Label, Label>> leave_redirect = null;
+                       for (int i = 0; i < jumps_table.Length; ++i) {
+                               var val = redirected_jumps [i];
+
+                               if (val.Item2) {
+                                       if (leave_redirect == null)
+                                               leave_redirect = new List<Tuple<Label, Label>> ();
+                                       var label = ec.DefineLabel ();
+                                       leave_redirect.Add (Tuple.Create (label, val.Item1));
+                                       jumps_table [i] = label;
+                               } else {
+                                       jumps_table [i] = val.Item1;
+                               }
+                       }
+
+                       ec.Emit (OpCodes.Switch, jumps_table);
+
+                       if (leave_redirect != null) {
+                               foreach (var entry in leave_redirect) {
+                                       ec.MarkLabel (entry.Item1);
+                                       ec.Emit (OpCodes.Leave, entry.Item2);
+                               }
+                       }
 
                        // Mark fallthrough label
-                       ec.MarkLabel (redirected_jumps [0]);
+                       ec.MarkLabel (jumps_table [0]);
                }
 
                protected override bool DoFlowAnalysis (FlowAnalysisContext fc)
index f09a598caf316290ea4852c5ab69334206dd0981..e0dfde276fba9a93e35fabefc6859b9e9f16b459 100644 (file)
@@ -207,11 +207,14 @@ class Tester : DynamicObjectMock
                }
        }
 
-       static FieldInfo flags = typeof (CSharpArgumentInfo).GetField ("flags", BindingFlags.NonPublic | BindingFlags.Instance);
+       static PropertyInfo flags = typeof (CSharpArgumentInfo).GetProperty ("Flags", BindingFlags.NonPublic | BindingFlags.Instance);
 
        static void AssertArgument (CallSiteBinder obj, CSharpArgumentInfo[] expected, string name)
        {
-               var ai = obj.GetType ().GetField ("argumentInfo", BindingFlags.NonPublic | BindingFlags.Instance);
+               var ai = obj.GetType ().GetField ("_argumentInfo", BindingFlags.NonPublic | BindingFlags.Instance);
+               if (ai == null)
+                       throw new ApplicationException ("Could not find 'argumentInfo' private field on " + obj.GetType ());
+
                IList<CSharpArgumentInfo> values = (IList<CSharpArgumentInfo>) ai.GetValue (obj);
                if (values.Count != expected.Length)
                        throw new ApplicationException (name + ": Array length does not match " + values.Count + " != " + expected.Length);
index 42433a3e9cdb64e7a0656020c14bcc1c20e131b4..9039c1f09002342be383d112e1e43f964ffee5c7 100644 (file)
@@ -66,7 +66,7 @@ public class Test
 
                if (Disposable.Counter != 1)
                        return false;
-
+/*
                try {
                        using (dynamic u = new Disposable ()) {
                                u.VV ();
@@ -79,7 +79,7 @@ public class Test
                using (dynamic u = new Disposable ()) {
                        u.Test ();
                }
-
+*/
                return true;
        }
 
index f64fdc0b53c2afa1e247eaee8f0739dd7615ab60..c01a0fae71b21f738ea359eb178e8072826c8707 100644 (file)
@@ -40,6 +40,7 @@ public class Test
                a[4] ^= b;
                
                dynamic d = 1;
+/*
                b = byte.MaxValue;
                try {
                        checked {
@@ -50,7 +51,7 @@ public class Test
                }
                        
                b += d;
-               
+*/
                try {
                        checked {
                                a.Byte += 100;
index a7ee0ef60afa5ad270ba610721609ccbac0c1da4..2cba37f3e8f32417a72aef55721f2934eac6f0ff 100644 (file)
@@ -23,7 +23,7 @@ class Tester
                        () => {
                                dynamic d = 1;
                                d ();
-                       }, "Cannot invoke a non-delegate type `int'");
+                       }, "Cannot invoke a non-delegate type");
        }
        
        void Using_1 ()
@@ -31,7 +31,7 @@ class Tester
                AssertError (
                        () => {
                                using (dynamic d = 1) { }
-                       }, "Cannot implicitly convert type `int' to `System.IDisposable'");
+                       }, "Cannot implicitly convert type 'int' to 'System.IDisposable'");
        }
        
        void Unsafe_1 ()
@@ -39,7 +39,7 @@ class Tester
                dynamic d = 1;
                AssertError (
                        () => Helper.Foo (d),
-                       "Pointers and fixed size buffers cannot be used in a dynamic context");
+                       "Dynamic calls cannot be used in conjunction with pointers");
        }
        
        void NullableConversion ()
@@ -50,7 +50,7 @@ class Tester
                                dynamic b = false;
                                byte? b2 = null;
                                b &= b2;
-                       }, "Operator `&=' cannot be applied to operands of type `bool' and `byte?'");
+                       }, "Operator '&=' cannot be applied to operands of type 'bool' and 'byte?'");
        }
        
 #pragma warning restore 169
index 58578fe3b50ab5351a159c1babe4262593ee6f06..b0c186b8ebe77a5c871e1dfd9b773c1f6fdaae82 100644 (file)
@@ -34,7 +34,7 @@ public class Test
                        d.Foo ();
                        return 1;
                } catch (RuntimeBinderException e) {
-                       if (e.Message != "`A.N.Foo()' is inaccessible due to its protection level")
+                       if (e.Message != "'object' does not contain a definition for 'Foo'")
                                return 2;
                }
                
@@ -42,7 +42,7 @@ public class Test
                        var x = d.Property;
                        return 3;
                } catch (RuntimeBinderException e) {
-                       if (e.Message != "`A.N.Property.get' is inaccessible due to its protection level")
+                       if (e.Message != "'object' does not contain a definition for 'Property'")
                                return 4;
                }
 
@@ -50,7 +50,7 @@ public class Test
                        var x = d [4];
                        return 5;
                } catch (RuntimeBinderException e) {
-                       if (e.Message != "`A.N.this[int]' is inaccessible due to its protection level")
+                       if (e.Message != "Cannot apply indexing with [] to an expression of type 'object'")
                                return 6;
                }
 
index dea56ec61efc0932d51eec86219ad44962a3a50d..0417292753ed3c6a6e02347766d9b00bf04465a2 100644 (file)
@@ -19,7 +19,7 @@ public class Test
                try {
                        getter.Target (getter, new C ());
                } catch (RuntimeBinderException e) {
-                       if (e.Message == "`C' does not contain a definition for `n'")
+                       if (e.Message == "'C' does not contain a definition for 'n'")
                                return 0;
 
                        return 2;
index b08555808a2011b40f1a1dbea436fab9e9154e93..cd610bf123ae74ffa87f4150ad8b7a2c4d5476ad 100644 (file)
@@ -16,7 +16,7 @@ public class Test
                        d.Value = (object)"value";
                        return 1;
                } catch (RuntimeBinderException e) {
-                       if (e.Message != "Cannot implicitly convert type `object' to `string'. An explicit conversion exists (are you missing a cast?)")
+                       if (e.Message != "Cannot implicitly convert type 'object' to 'string'. An explicit conversion exists (are you missing a cast?)")
                                return 2;
                }
                
diff --git a/mcs/tests/gtest-644.cs b/mcs/tests/gtest-644.cs
new file mode 100644 (file)
index 0000000..609f879
--- /dev/null
@@ -0,0 +1,29 @@
+using System;
+
+public struct MoneyValue
+{
+       private readonly decimal _amount;
+
+       public MoneyValue (decimal amount)
+       {
+               _amount = amount;
+       }
+
+       public static implicit operator decimal (MoneyValue moneyValue)
+       {
+               return moneyValue._amount;
+       }
+}
+
+public class Program
+{
+       static void Main ()
+       {
+               var nullMoneyValue = (MoneyValue?) null;
+               var moneyValue = new MoneyValue (123);
+
+               var crashApplication = nullMoneyValue < moneyValue; 
+
+               Console.WriteLine("All OK");
+       }
+}
diff --git a/mcs/tests/gtest-645-lib.cs b/mcs/tests/gtest-645-lib.cs
new file mode 100644 (file)
index 0000000..24c31d7
--- /dev/null
@@ -0,0 +1,10 @@
+// Compiler options: -target:library
+
+namespace SeparateAssembly
+{
+       public interface IGenericAction<T1, T2>
+       {
+               void AddAction(IGenericAction<T1, T2> action);
+               void AddAction(IGenericAction<T2, T1> action);
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/gtest-645.cs b/mcs/tests/gtest-645.cs
new file mode 100644 (file)
index 0000000..5ed87ba
--- /dev/null
@@ -0,0 +1,17 @@
+// Compiler options: -r:gtest-645-lib.dll
+
+using System;
+using SeparateAssembly;
+
+class Program
+{
+       public static void Main()
+       {
+       }
+
+       public static void AddChildButton<T1, T2>(IGenericAction<T1, T2> action)
+       {
+               IGenericAction<T2, T1> childAction = null;
+               action.AddAction (childAction);
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-anon-178.cs b/mcs/tests/test-anon-178.cs
new file mode 100644 (file)
index 0000000..278bdbe
--- /dev/null
@@ -0,0 +1,31 @@
+using System;
+
+public abstract class BaseClass<T>
+{
+}
+
+public class DerivedClass : BaseClass<int>
+{
+}
+
+public abstract class CA
+{
+       [Obsolete]
+       public virtual void Foo<T, U> (U args) where T : BaseClass<U>, new()
+       {
+       }
+}
+
+public class CB : CA
+{
+       public CB ()
+       {
+               int x = 4;
+               Action<int> pp = r => base.Foo<DerivedClass, int> (x);
+       }
+
+       public static void Main ()
+       {
+               new CB ();
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-async-90.cs b/mcs/tests/test-async-90.cs
new file mode 100644 (file)
index 0000000..8b1adc6
--- /dev/null
@@ -0,0 +1,35 @@
+using System.Threading.Tasks;
+
+static class Y
+{
+    public static string ExCall (this X x)
+    {
+        return null;
+    }
+}
+
+class X
+{
+    static X Test (object o)
+    {
+        return null;
+    }
+
+    X Prop { get; set;}
+
+    X Call ()
+    {
+        return null;
+    }
+
+    public static void Main ()
+    {
+        var x = new X ();
+        x.Test ().Wait ();
+    }
+
+    async Task Test ()
+    {
+        var x = X.Test (await Task.FromResult (1))?.Prop?.ExCall ();
+    }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-async-91.cs b/mcs/tests/test-async-91.cs
new file mode 100644 (file)
index 0000000..405da3c
--- /dev/null
@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+
+class C : IDisposable
+{
+       public void Dispose ()
+       {
+               Console.WriteLine ("Disposed");
+               TestClass.Passed++;
+       }
+}
+
+public class TestClass
+{
+       public static int Passed;
+
+       public static async Task Test ()
+       {
+               using (var device_resource = new C ()) {
+                       try {
+                               Console.WriteLine ("aa");
+                               return;
+                       } finally {
+                               await Task.Delay (0);
+                       }
+               }
+       }
+
+       public static int Main()
+       {
+               Test ().Wait ();
+               if (Passed != 1)
+                       return 1;
+
+               Console.WriteLine ("PASSED");
+               return 0;
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-null-operator-24.cs b/mcs/tests/test-null-operator-24.cs
new file mode 100644 (file)
index 0000000..77ce5d9
--- /dev/null
@@ -0,0 +1,19 @@
+using System;
+class X
+{
+       public int Field { get; set; }
+
+       public int F3 { get; set; }
+}
+
+class App
+{
+       static void Main()
+       {
+               string s = null;
+               var x = new X {
+                       Field = s?.ToString () == null ? 1 : 2
+               }.F3;
+       }
+}
\ No newline at end of file
index 0cec93cb80a1aa8d524cde9a05381e968d548462..661f426ec6adcfa6daa8dc88c1f6c96edbb2f634 100644 (file)
         <size>99</size>
       </method>
       <method name="Void AssertArgument(System.Runtime.CompilerServices.CallSiteBinder, Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo[], System.String)" attrs="145">
-        <size>172</size>
+        <size>206</size>
       </method>
       <method name="Void BinaryAdd_1(System.Object, DynamicObjectMock)" attrs="129">
         <size>124</size>
         <size>235</size>
       </method>
       <method name="Boolean UsingTest()" attrs="129">
-        <size>619</size>
+        <size>222</size>
       </method>
       <method name="Int32 Main()" attrs="150">
         <size>99</size>
         <size>2</size>
       </method>
       <method name="Int32 Main()" attrs="150">
-        <size>3609</size>
+        <size>3273</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>39</size>
       </method>
     </type>
   </test>
+  <test name="gtest-644.cs">
+    <type name="MoneyValue">
+      <method name="System.Decimal op_Implicit(MoneyValue)" attrs="2198">
+        <size>16</size>
+      </method>
+      <method name="Void .ctor(Decimal)" attrs="6278">
+        <size>9</size>
+      </method>
+    </type>
+    <type name="Program">
+      <method name="Void Main()" attrs="145">
+        <size>75</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
+  <test name="gtest-645.cs">
+    <type name="Program">
+      <method name="Void Main()" attrs="150">
+        <size>2</size>
+      </method>
+      <method name="Void AddChildButton[T1,T2](SeparateAssembly.IGenericAction`2[T1,T2])" attrs="150">
+        <size>11</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-anontype-01.cs">
     <type name="Test">
       <method name="Int32 Main()" attrs="150">
       </method>
     </type>
   </test>
+  <test name="test-anon-178.cs">
+    <type name="BaseClass`1[T]">
+      <method name="Void .ctor()" attrs="6276">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="DerivedClass">
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="CA">
+      <method name="Void Foo[T,U](U)" attrs="454">
+        <size>2</size>
+      </method>
+      <method name="Void .ctor()" attrs="6276">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="CB">
+      <method name="Void Main()" attrs="150">
+        <size>8</size>
+      </method>
+      <method name="Void &lt;Foo&gt;__BaseCallProxy0[T,U](U)" attrs="129">
+        <size>8</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>41</size>
+      </method>
+    </type>
+    <type name="CB+&lt;CB&gt;c__AnonStorey0">
+      <method name="Void &lt;&gt;m__0(Int32)" attrs="131">
+        <size>18</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-anon-18.cs">
     <type name="A">
       <method name="Void Invoke()" attrs="454">
     </type>
     <type name="Test+&lt;TestFinallyWithReturn&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
-        <size>377</size>
+        <size>382</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;TestFinallyWithReturnNoValue&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
-        <size>347</size>
+        <size>352</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;TestFinallyWithGoto&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
-        <size>370</size>
+        <size>375</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;TestFinallyWithGotoAndReturn&gt;c__async4">
       <method name="Void MoveNext()" attrs="486">
-        <size>407</size>
+        <size>417</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;TestNestedReturn&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
-        <size>845</size>
+        <size>855</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;TestNestedGoto&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
-        <size>848</size>
+        <size>858</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;BreakTest&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
-        <size>898</size>
+        <size>903</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="Test+&lt;ContinueTest&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
-        <size>898</size>
+        <size>903</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
     </type>
     <type name="X+&lt;Test&gt;c__async0">
       <method name="Void MoveNext()" attrs="486">
-        <size>269</size>
+        <size>274</size>
       </method>
       <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
   </test>
+  <test name="test-async-90.cs">
+    <type name="Y">
+      <method name="System.String ExCall(X)" attrs="150">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="X">
+      <method name="X Test(System.Object)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="X get_Prop()" attrs="2177">
+        <size>14</size>
+      </method>
+      <method name="Void set_Prop(X)" attrs="2177">
+        <size>8</size>
+      </method>
+      <method name="X Call()" attrs="129">
+        <size>10</size>
+      </method>
+      <method name="Void Main()" attrs="150">
+        <size>19</size>
+      </method>
+      <method name="System.Threading.Tasks.Task Test()" attrs="129">
+        <size>33</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="X+&lt;Test&gt;c__async0">
+      <method name="Void MoveNext()" attrs="486">
+        <size>290</size>
+      </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-async-91.cs">
+    <type name="C">
+      <method name="Void Dispose()" attrs="486">
+        <size>24</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="TestClass">
+      <method name="System.Threading.Tasks.Task Test()" attrs="150">
+        <size>33</size>
+      </method>
+      <method name="Int32 Main()" attrs="150">
+        <size>48</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="TestClass+&lt;Test&gt;c__async0">
+      <method name="Void MoveNext()" attrs="486">
+        <size>309</size>
+      </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+  </test>
   <test name="test-cls-00.cs">
     <type name="CLSCLass_6">
       <method name="Void add_Disposed(Delegate)" attrs="2182">
       </method>
     </type>
   </test>
+  <test name="test-null-operator-24.cs">
+    <type name="X">
+      <method name="Int32 get_Field()" attrs="2182">
+        <size>14</size>
+      </method>
+      <method name="Void set_Field(Int32)" attrs="2182">
+        <size>8</size>
+      </method>
+      <method name="Int32 get_F3()" attrs="2182">
+        <size>14</size>
+      </method>
+      <method name="Void set_F3(Int32)" attrs="2182">
+        <size>8</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="App">
+      <method name="Void Main()" attrs="145">
+        <size>50</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-partial-01.cs">
     <type name="Foo.Hello">
       <method name="Void .ctor()" attrs="6278">
index a6708e2d371e1245bcce89b70772e3ff57ebf7ae..aad8dad1b09486403dbd338ac9b968e89b6f6bab 100644 (file)
@@ -7,4 +7,8 @@ NO_INSTALL = yes
 
 LIB_REFS = System Mono.Cecil
 
+ifdef MCS_MODE
+LIB_REFS += Mono.Cecil.Mdb
+endif
+
 include ../../build/executable.make
index 81da9380e8a6ce2ed8c2f8041af20d460c97833c..3226b3911d9b291093cc8d100a871014dc7f016a 100644 (file)
@@ -100,17 +100,12 @@ public class Program
 
        static void RewriteAssembly (string assemblyLocation, Dictionary<string, string> resourcesStrings, CmdOptions options)
        {
-               var debugSymbols = Path.ChangeExtension (assemblyLocation, "pdb");
-               var useDebugSymbols = File.Exists (debugSymbols);
-
                var readerParameters = new ReaderParameters {
+                       ReadSymbols = true,
                        ReadWrite = true,
+                       SymbolReaderProvider = new DefaultSymbolReaderProvider (false)
                };
 
-               if (useDebugSymbols) {
-                       readerParameters.SymbolReaderProvider = new PortablePdbReaderProvider ();
-               }
-
                using (var assembly = AssemblyDefinition.ReadAssembly (assemblyLocation, readerParameters)) {
                        foreach (var module in assembly.Modules) {
                                foreach (var type in module.GetTypes ()) {
@@ -135,11 +130,9 @@ public class Program
                                }
                        }
 
-                       var writerParameters = new WriterParameters ();
-
-                       if (useDebugSymbols) {
-                               writerParameters.SymbolWriterProvider = new PortablePdbWriterProvider ();
-                       }
+                       var writerParameters = new WriterParameters () {
+                               WriteSymbols = assembly.MainModule.HasSymbols
+                       };
 
                        assembly.Write (writerParameters);
                }
index 31764d0efac7e6113a3689c233918c2aed052786..a92e407162ad6077daff692cbe4323b33ee4a675 100644 (file)
 
                <type fullname="System.Collections.Generic.ICollection`1" />
                <type fullname="System.Collections.Generic.IEnumerable`1" />
+               <type fullname="System.Collections.Generic.IEnumerator`1" />
+               <type fullname="System.Collections.Generic.IReadOnlyList`1" />
+               <type fullname="System.Collections.Generic.IReadOnlyCollection`1" />
+
                <type fullname="System.Collections.Generic.IList`1" />
                <type fullname="System.Collections.Generic.GenericEqualityComparer`1">
                        <method name=".ctor" />
index 95441c17b621db63c163c7824c2cdb934330d6ff..44e49261a6ce85926b61641d19ac55a4a5929f21 100644 (file)
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />\r
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\*.cs" />\r
     <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\*.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ISymUnmanagedDocumentWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ISymUnmanagedWriter2.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ModuleMetadata.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\PdbHelper.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\PdbReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\PdbWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\SymDocumentWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\SymWriter.cs" />\r
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\*.cs" />\r
     <Compile Include="..\..\..\external\cecil\System.Security.Cryptography\*.cs" />\r
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />\r
     <Compile Include="LocationProvider.cs" />\r
index da336168f902e41e14155acdcacc879b9043d180..8e08e43950dd8ae2420e6e93d4fee0b1422eddd4 100644 (file)
@@ -100,11 +100,4 @@ Logger.cs
 ../../../external/cecil/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs
 ../../../external/cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/*.cs
 ../../../external/cecil/symbols/pdb/Microsoft.Cci.Pdb/*.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/ISymUnmanagedDocumentWriter.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/ISymUnmanagedWriter2.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/ModuleMetadata.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/PdbReader.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/PdbWriter.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/SymDocumentWriter.cs
-../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/SymWriter.cs
+../../../external/cecil/symbols/pdb/Mono.Cecil.Pdb/*.cs
index e34909337b00f2c6a4448f1d29fc5d8084d52af0..3fe5475097d1c05a094dc63ac97b30a1becf3fa4 100644 (file)
@@ -55,16 +55,8 @@ namespace Mono.XBuild.CommandLine {
                // this does nothing but adds strong reference to Microsoft.Build.Tasks*.dll that we need to load consistently.
                Microsoft.Build.Tasks.Copy dummy;
 #pragma warning restore
-
                public static void Main (string[] args)
                {
-                       Console.ForegroundColor = ConsoleColor.DarkRed;
-                       Console.WriteLine ();
-                       Console.WriteLine (">>>> xbuild tool is deprecated and will be removed in future updates, use msbuild instead <<<<");
-                       Console.WriteLine ();
-                       Console.ResetColor ();
-
-
                        MainClass mc = new MainClass ();
                        mc.args = args;
                        mc.Execute ();
@@ -83,12 +75,20 @@ namespace Mono.XBuild.CommandLine {
                        bool show_stacktrace = false;
                        
                        try {
-                               parameters.ParseArguments (args);
+                               try {
+                                       parameters.ParseArguments (args);
+                               } catch {
+                                       ShowDeprecationNotice ();
+                                       throw;
+                               }
+
                                show_stacktrace = (parameters.LoggerVerbosity == LoggerVerbosity.Detailed ||
                                        parameters.LoggerVerbosity == LoggerVerbosity.Diagnostic);
                                
-                               if (!parameters.NoLogo)
+                               if (!parameters.NoLogo) {
+                                       ShowDeprecationNotice ();
                                        ErrorUtilities.ShowVersion (false);
+                               }
                                
                                engine  = Engine.GlobalEngine;
                                if (!String.IsNullOrEmpty (parameters.ToolsVersion)) {
@@ -173,6 +173,15 @@ namespace Mono.XBuild.CommandLine {
                        }
 
                }
+
+               void ShowDeprecationNotice ()
+               {
+                       Console.ForegroundColor = ConsoleColor.DarkRed;
+                       Console.WriteLine ();
+                       Console.WriteLine (">>>> xbuild tool is deprecated and will be removed in future updates, use msbuild instead <<<<");
+                       Console.WriteLine ();
+                       Console.ResetColor ();
+               }
        }
 
        // code from mcs/report.cs
index 38aa44de6caf0297dd75eb7ecc4432458312ce4c..f71f0bc9f4a667052760a35b79296e6047badfd1 100644 (file)
@@ -168,8 +168,6 @@ void mono_gc_wbarrier_set_root (gpointer ptr, MonoObject *value);
        mono_gc_wbarrier_set_root (&((s)->fieldname), (MonoObject*)value); \
 } while (0)
 
-void  mono_gc_finalize_threadpool_threads (void);
-
 /* fast allocation support */
 
 typedef enum {
index bf53c0f126b18873869bc018cc674cbb2fa057b6..7402096d704dfd5bf71ba5d1ac5d7b8801152365 100644 (file)
@@ -68,7 +68,6 @@ static MonoCoopMutex finalizer_mutex;
 static MonoCoopMutex reference_queue_mutex;
 
 static GSList *domains_to_finalize;
-static MonoMList *threads_to_finalize;
 
 static gboolean finalizer_thread_exited;
 /* Uses finalizer_mutex */
@@ -157,18 +156,6 @@ coop_cond_timedwait_alertable (MonoCoopCond *cond, MonoCoopMutex *mutex, guint32
        return res;
 }
 
-static gboolean
-add_thread_to_finalize (MonoInternalThread *thread, MonoError *error)
-{
-       mono_error_init (error);
-       mono_finalizer_lock ();
-       if (!threads_to_finalize)
-               MONO_GC_REGISTER_ROOT_SINGLE (threads_to_finalize, MONO_ROOT_SOURCE_FINALIZER_QUEUE, "finalizable threads list");
-       threads_to_finalize = mono_mlist_append_checked (threads_to_finalize, (MonoObject*)thread, error);
-       mono_finalizer_unlock ();
-       return is_ok (error);
-}
-
 /* 
  * actually, we might want to queue the finalize requests in a separate thread,
  * but we need to be careful about the execution domain of the thread...
@@ -241,15 +228,6 @@ mono_gc_run_finalize (void *obj, void *data)
                if (mono_gc_is_finalizer_internal_thread (t))
                        /* Avoid finalizing ourselves */
                        return;
-
-               if (t->threadpool_thread && finalizing_root_domain) {
-                       /* Don't finalize threadpool threads when
-                          shutting down - they're finalized when the
-                          threadpool shuts down. */
-                       if (!add_thread_to_finalize (t, &error))
-                               goto unhandled_error;
-                       return;
-               }
        }
 
        if (o->vtable->klass->image == mono_defaults.corlib && !strcmp (o->vtable->klass->name, "DynamicMethod") && finalizing_root_domain) {
@@ -344,22 +322,6 @@ unhandled_error:
        mono_domain_set_internal (caller_domain);
 }
 
-void
-mono_gc_finalize_threadpool_threads (void)
-{
-       while (threads_to_finalize) {
-               MonoInternalThread *thread = (MonoInternalThread*) mono_mlist_get_data (threads_to_finalize);
-
-               /* Force finalization of the thread. */
-               thread->threadpool_thread = FALSE;
-               mono_object_register_finalizer ((MonoObject*)thread);
-
-               mono_gc_run_finalize (thread, NULL);
-
-               threads_to_finalize = mono_mlist_next (threads_to_finalize);
-       }
-}
-
 gpointer
 mono_gc_out_of_memory (size_t size)
 {
@@ -555,11 +517,6 @@ mono_domain_finalize (MonoDomain *domain, guint32 timeout)
                goto done;
        }
 
-       if (domain == mono_get_root_domain ()) {
-               mono_threadpool_cleanup ();
-               mono_gc_finalize_threadpool_threads ();
-       }
-
 done:
        if (InterlockedDecrement (&req->ref) == 0) {
                mono_coop_sem_destroy (&req->done);
index 4b56f40534580723c95cc798dbaf9b8d2e636d49..120d41fb28ff6d5e7e89a60cf1b80dc02a71d993 100644 (file)
@@ -8542,7 +8542,7 @@ mono_create_icall_signature (const char *sigstr)
        res = mono_metadata_signature_alloc (corlib, len - 1);
        res->pinvoke = 1;
 
-#ifdef HOST_WIN32
+#ifdef TARGET_WIN32
        /* 
         * Under windows, the default pinvoke calling convention is STDCALL but
         * we need CDECL.
index 0309ce8404e1593cd2f88e5b84af17ac0a61c4f7..8bd15165bcf5b549044e2e7b394a1e01b7c45c9a 100644 (file)
@@ -2436,7 +2436,7 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
        }
        if (m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
                signature->pinvoke = 1;
-#ifdef HOST_WIN32
+#ifdef TARGET_WIN32
                /*
                 * On Windows the default pinvoke calling convention is STDCALL but
                 * we need CDECL since this is actually an icall.
index 6020bf50eb45f2a18f5fe5295728ccbee8d9572d..76f38e399d861bfb4d679bfc2072ecdb8bb23a9e 100644 (file)
@@ -426,7 +426,9 @@ mono_delegate_to_ftnptr (MonoDelegate *delegate)
                target_handle = mono_gchandle_new_weakref (delegate->target, FALSE);
        }
 
-       wrapper = mono_marshal_get_managed_wrapper (method, klass, target_handle);
+       wrapper = mono_marshal_get_managed_wrapper (method, klass, target_handle, &error);
+       if (!is_ok (&error))
+               goto fail;
 
        delegate->delegate_trampoline = mono_compile_method_checked (wrapper, &error);
        if (!is_ok (&error))
@@ -8659,9 +8661,8 @@ mono_marshal_set_callconv_from_modopt (MonoMethod *method, MonoMethodSignature *
  * If target_handle==0, the wrapper info will be a WrapperInfo structure.
  */
 MonoMethod *
-mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t target_handle)
+mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t target_handle, MonoError *error)
 {
-       MonoError error;
        MonoMethodSignature *sig, *csig, *invoke_sig;
        MonoMethodBuilder *mb;
        MonoMethod *res, *invoke;
@@ -8672,7 +8673,12 @@ mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass,
        EmitMarshalContext m;
 
        g_assert (method != NULL);
-       g_assert (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL));
+       mono_error_init (error);
+
+       if (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
+               mono_error_set_invalid_program (error, "Failed because method (%s) marked PInvokeCallback (managed method) and extern (unmanaged) simultaneously.", mono_method_full_name (method, TRUE));
+               return NULL;
+       }
 
        /* 
         * FIXME: Should cache the method+delegate type pair, since the same method
@@ -8726,8 +8732,8 @@ mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass,
                 * contents of the attribute without constructing it, as that might not be
                 * possible when running in cross-compiling mode.
                 */
-               cinfo = mono_custom_attrs_from_class_checked (delegate_klass, &error);
-               mono_error_assert_ok (&error);
+               cinfo = mono_custom_attrs_from_class_checked (delegate_klass, error);
+               mono_error_assert_ok (error);
                attr = NULL;
                if (cinfo) {
                        for (i = 0; i < cinfo->num_attrs; ++i) {
index e00661b1b593604f318b93cd47064c7fab2362fa..4b1c185f876011751b95773b1a031527dd3342ad 100644 (file)
@@ -330,7 +330,7 @@ MonoMethodSignature*
 mono_marshal_get_string_ctor_signature (MonoMethod *method);
 
 MonoMethod *
-mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t this_loc);
+mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t this_loc, MonoError *exernal_error);
 
 gpointer
 mono_marshal_get_vtfixup_ftnptr (MonoImage *image, guint32 token, guint16 type);
index 4e6e08c2b3ec778a3842f87c84dc773d984bf343..df6643672e986ef898e953da9df44e256bcec00a 100644 (file)
@@ -109,9 +109,6 @@ mono_runtime_try_shutdown (void)
 
        mono_runtime_set_shutting_down ();
 
-       /* This will kill the tp threads which cannot be suspended */
-       mono_threadpool_cleanup ();
-
        /*TODO move the follow to here:
        mono_thread_suspend_all_other_threads (); OR  mono_thread_wait_all_other_threads
 
index ace9a00bf6a8adb9bd83bcf6944f01bf84cfb882..618d995dceb7db96eccc7cccbdc98e1852f4cd56 100644 (file)
@@ -306,6 +306,12 @@ wait_callback (gint fd, gint events, gpointer user_data)
        }
 }
 
+static void
+selector_thread_interrupt (gpointer unused)
+{
+       selector_thread_wakeup ();
+}
+
 static gsize WINAPI
 selector_thread (gpointer data)
 {
@@ -321,9 +327,13 @@ selector_thread (gpointer data)
 
        states = mono_g_hash_table_new_type (g_direct_hash, g_direct_equal, MONO_HASH_VALUE_GC, MONO_ROOT_SOURCE_THREAD_POOL, "i/o thread pool states table");
 
-       for (;;) {
+       while (!mono_runtime_is_shutting_down ()) {
                gint i, j;
                gint res;
+               gboolean interrupted = FALSE;
+
+               if (mono_thread_interruption_checkpoint ())
+                       continue;
 
                mono_coop_mutex_lock (&threadpool_io->updates_lock);
 
@@ -422,10 +432,15 @@ selector_thread (gpointer data)
 
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: wai");
 
-               res = threadpool_io->backend.event_wait (wait_callback, states);
+               mono_thread_info_install_interrupt (selector_thread_interrupt, NULL, &interrupted);
+               if (interrupted)
+                       continue;
 
-               if (res == -1 || mono_runtime_is_shutting_down ())
+               res = threadpool_io->backend.event_wait (wait_callback, states);
+               if (res == -1)
                        break;
+
+               mono_thread_info_uninstall_interrupt (&interrupted);
        }
 
        mono_g_hash_table_destroy (states);
@@ -548,13 +563,7 @@ initialize (void)
 static void
 cleanup (void)
 {
-       /* we make the assumption along the code that we are
-        * cleaning up only if the runtime is shutting down */
-       g_assert (mono_runtime_is_shutting_down ());
-
-       selector_thread_wakeup ();
-       while (io_selector_running)
-               mono_thread_info_usleep (1000);
+       // FIXME destroy everything
 }
 
 void
index 6e3a4b52130246a4f2a1d63fe02b3f443e51bca6..5fc716a74e73e87999bc0e124fdb9a19b64f1c9f 100644 (file)
@@ -25,7 +25,6 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-complex.h>
-#include <mono/utils/mono-lazy-init.h>
 #include <mono/utils/mono-logger.h>
 #include <mono/utils/mono-logger-internals.h>
 #include <mono/utils/mono-proclib.h>
@@ -125,18 +124,14 @@ typedef union {
        gint64 as_gint64;
 } ThreadPoolWorkerCounter;
 
-typedef MonoInternalThread ThreadPoolWorkerThread;
-
-struct MonoThreadPoolWorker {
+typedef struct {
        MonoRefCount ref;
 
        ThreadPoolWorkerCounter counters;
 
-       GPtrArray *threads; // ThreadPoolWorkerThread* []
-       MonoCoopMutex threads_lock; /* protect access to working_threads and parked_threads */
+       MonoCoopMutex parked_threads_lock;
        gint32 parked_threads_count;
        MonoCoopCond parked_threads_cond;
-       MonoCoopCond threads_exit_cond;
 
        ThreadPoolWorkItem *work_items; // ThreadPoolWorkItem []
        gint32 work_items_count;
@@ -165,7 +160,7 @@ struct MonoThreadPoolWorker {
        gboolean suspended;
 
        gint32 monitor_status;
-};
+} ThreadPoolWorker;
 
 enum {
        MONITOR_STATUS_REQUESTED,
@@ -173,6 +168,8 @@ enum {
        MONITOR_STATUS_NOT_RUNNING,
 };
 
+static ThreadPoolWorker worker;
+
 #define COUNTER_CHECK(counter) \
        do { \
                g_assert (counter._.max_working > 0); \
@@ -180,23 +177,22 @@ enum {
                g_assert (counter._.working >= 0); \
        } while (0)
 
-#define COUNTER_ATOMIC(worker,var,block) \
+#define COUNTER_ATOMIC(var,block) \
        do { \
                ThreadPoolWorkerCounter __old; \
                do { \
-                       g_assert (worker); \
-                       __old = COUNTER_READ (worker); \
+                       __old = COUNTER_READ (); \
                        (var) = __old; \
                        { block; } \
                        COUNTER_CHECK (var); \
-               } while (InterlockedCompareExchange64 (&worker->counters.as_gint64, (var).as_gint64, __old.as_gint64) != __old.as_gint64); \
+               } while (InterlockedCompareExchange64 (&worker.counters.as_gint64, (var).as_gint64, __old.as_gint64) != __old.as_gint64); \
        } while (0)
 
 static inline ThreadPoolWorkerCounter
-COUNTER_READ (MonoThreadPoolWorker *worker)
+COUNTER_READ (void)
 {
        ThreadPoolWorkerCounter counter;
-       counter.as_gint64 = InterlockedRead64 (&worker->counters.as_gint64);
+       counter.as_gint64 = InterlockedRead64 (&worker.counters.as_gint64);
        return counter;
 }
 
@@ -221,49 +217,44 @@ rand_next (gpointer *handle, guint32 min, guint32 max)
 static void
 destroy (gpointer data)
 {
-       MonoThreadPoolWorker *worker;
+       mono_coop_mutex_destroy (&worker.parked_threads_lock);
+       mono_coop_cond_destroy (&worker.parked_threads_cond);
 
-       worker = (MonoThreadPoolWorker*) data;
-       g_assert (worker);
+       mono_coop_mutex_destroy (&worker.work_items_lock);
 
-       // FIXME destroy everything
+       mono_coop_mutex_destroy (&worker.worker_creation_lock);
 
-       g_free (worker);
+       mono_coop_mutex_destroy (&worker.heuristic_lock);
+
+       g_free (worker.cpu_usage_state);
 }
 
 void
-mono_threadpool_worker_init (MonoThreadPoolWorker **worker)
+mono_threadpool_worker_init (void)
 {
-       MonoThreadPoolWorker *wk;
        ThreadPoolHillClimbing *hc;
        const char *threads_per_cpu_env;
        gint threads_per_cpu;
        gint threads_count;
 
-       g_assert (worker);
-
-       wk = *worker = g_new0 (MonoThreadPoolWorker, 1);
+       mono_refcount_init (&worker, destroy);
 
-       mono_refcount_init (wk, destroy);
+       mono_coop_mutex_init (&worker.parked_threads_lock);
+       worker.parked_threads_count = 0;
+       mono_coop_cond_init (&worker.parked_threads_cond);
 
-       wk->threads = g_ptr_array_new ();
-       mono_coop_mutex_init (&wk->threads_lock);
-       wk->parked_threads_count = 0;
-       mono_coop_cond_init (&wk->parked_threads_cond);
-       mono_coop_cond_init (&wk->threads_exit_cond);
+       /* worker.work_items_size is inited to 0 */
+       mono_coop_mutex_init (&worker.work_items_lock);
 
-       /* wk->work_items_size is inited to 0 */
-       mono_coop_mutex_init (&wk->work_items_lock);
+       worker.worker_creation_current_second = -1;
+       mono_coop_mutex_init (&worker.worker_creation_lock);
 
-       wk->worker_creation_current_second = -1;
-       mono_coop_mutex_init (&wk->worker_creation_lock);
-
-       wk->heuristic_adjustment_interval = 10;
-       mono_coop_mutex_init (&wk->heuristic_lock);
+       worker.heuristic_adjustment_interval = 10;
+       mono_coop_mutex_init (&worker.heuristic_lock);
 
        mono_rand_open ();
 
-       hc = &wk->heuristic_hill_climbing;
+       hc = &worker.heuristic_hill_climbing;
 
        hc->wave_period = HILL_CLIMBING_WAVE_PERIOD;
        hc->max_thread_wave_magnitude = HILL_CLIMBING_MAX_WAVE_MAGNITUDE;
@@ -297,187 +288,159 @@ mono_threadpool_worker_init (MonoThreadPoolWorker **worker)
 
        threads_count = mono_cpu_count () * threads_per_cpu;
 
-       wk->limit_worker_min = threads_count;
+       worker.limit_worker_min = threads_count;
 
 #if defined (PLATFORM_ANDROID) || defined (HOST_IOS)
-       wk->limit_worker_max = CLAMP (threads_count * 100, MIN (threads_count, 200), MAX (threads_count, 200));
+       worker.limit_worker_max = CLAMP (threads_count * 100, MIN (threads_count, 200), MAX (threads_count, 200));
 #else
-       wk->limit_worker_max = threads_count * 100;
+       worker.limit_worker_max = threads_count * 100;
 #endif
 
-       wk->counters._.max_working = wk->limit_worker_min;
+       worker.counters._.max_working = worker.limit_worker_min;
 
-       wk->cpu_usage_state = g_new0 (MonoCpuUsageState, 1);
+       worker.cpu_usage_state = g_new0 (MonoCpuUsageState, 1);
 
-       wk->suspended = FALSE;
+       worker.suspended = FALSE;
 
-       wk->monitor_status = MONITOR_STATUS_NOT_RUNNING;
+       worker.monitor_status = MONITOR_STATUS_NOT_RUNNING;
 }
 
 void
-mono_threadpool_worker_cleanup (MonoThreadPoolWorker *worker)
+mono_threadpool_worker_cleanup (void)
 {
-       MonoInternalThread *current;
-
-       /* we make the assumption along the code that we are
-        * cleaning up only if the runtime is shutting down */
-       g_assert (mono_runtime_is_shutting_down ());
-
-       current = mono_thread_internal_current ();
-
-       while (worker->monitor_status != MONITOR_STATUS_NOT_RUNNING)
-               mono_thread_info_sleep (1, NULL);
-
-       mono_coop_mutex_lock (&worker->threads_lock);
-
-       /* unpark all worker->parked_threads */
-       mono_coop_cond_broadcast (&worker->parked_threads_cond);
-
-#if 0
-       for (;;) {
-               ThreadPoolWorkerCounter counter;
-
-               counter = COUNTER_READ (worker);
-               if (counter._.starting + counter._.working + counter._.parked == 0)
-                       break;
-
-               if (counter._.starting + counter._.working + counter._.parked == 1) {
-                       if (worker->threads->len == 1 && g_ptr_array_index (worker->threads, 0) == current) {
-                               /* We are waiting on ourselves */
-                               break;
-                       }
-               }
-
-               mono_coop_cond_wait (&worker->threads_exit_cond, &worker->threads_lock);
-       }
-#endif
-
-       mono_coop_mutex_unlock (&worker->threads_lock);
-
-       mono_refcount_dec (worker);
+       mono_refcount_dec (&worker);
 }
 
 static void
-work_item_lock (MonoThreadPoolWorker *worker)
+work_item_lock (void)
 {
-       mono_coop_mutex_lock (&worker->work_items_lock);
+       mono_coop_mutex_lock (&worker.work_items_lock);
 }
 
 static void
-work_item_unlock (MonoThreadPoolWorker *worker)
+work_item_unlock (void)
 {
-       mono_coop_mutex_unlock (&worker->work_items_lock);
+       mono_coop_mutex_unlock (&worker.work_items_lock);
 }
 
 static void
-work_item_push (MonoThreadPoolWorker *worker, MonoThreadPoolWorkerCallback callback, gpointer data)
+work_item_push (MonoThreadPoolWorkerCallback callback, gpointer data)
 {
        ThreadPoolWorkItem work_item;
 
-       g_assert (worker);
        g_assert (callback);
 
        work_item.callback = callback;
        work_item.data = data;
 
-       work_item_lock (worker);
+       work_item_lock ();
 
-       g_assert (worker->work_items_count <= worker->work_items_size);
+       g_assert (worker.work_items_count <= worker.work_items_size);
 
-       if (G_UNLIKELY (worker->work_items_count == worker->work_items_size)) {
-               worker->work_items_size += 64;
-               worker->work_items = g_renew (ThreadPoolWorkItem, worker->work_items, worker->work_items_size);
+       if (G_UNLIKELY (worker.work_items_count == worker.work_items_size)) {
+               worker.work_items_size += 64;
+               worker.work_items = g_renew (ThreadPoolWorkItem, worker.work_items, worker.work_items_size);
        }
 
-       g_assert (worker->work_items);
+       g_assert (worker.work_items);
 
-       worker->work_items [worker->work_items_count ++] = work_item;
+       worker.work_items [worker.work_items_count ++] = work_item;
 
-       // printf ("[push] worker->work_items = %p, worker->work_items_count = %d, worker->work_items_size = %d\n",
-       //      worker->work_items, worker->work_items_count, worker->work_items_size);
+       // printf ("[push] worker.work_items = %p, worker.work_items_count = %d, worker.work_items_size = %d\n",
+       //      worker.work_items, worker.work_items_count, worker.work_items_size);
 
-       work_item_unlock (worker);
+       work_item_unlock ();
 }
 
 static gboolean
-work_item_try_pop (MonoThreadPoolWorker *worker, ThreadPoolWorkItem *work_item)
+work_item_try_pop (ThreadPoolWorkItem *work_item)
 {
-       g_assert (worker);
        g_assert (work_item);
 
-       work_item_lock (worker);
+       work_item_lock ();
 
-       // printf ("[pop]  worker->work_items = %p, worker->work_items_count = %d, worker->work_items_size = %d\n",
-       //      worker->work_items, worker->work_items_count, worker->work_items_size);
+       // printf ("[pop]  worker.work_items = %p, worker.work_items_count = %d, worker.work_items_size = %d\n",
+       //      worker.work_items, worker.work_items_count, worker.work_items_size);
 
-       if (worker->work_items_count == 0) {
-               work_item_unlock (worker);
+       if (worker.work_items_count == 0) {
+               work_item_unlock ();
                return FALSE;
        }
 
-       *work_item = worker->work_items [-- worker->work_items_count];
+       *work_item = worker.work_items [-- worker.work_items_count];
 
-       if (G_UNLIKELY (worker->work_items_count >= 64 * 3 && worker->work_items_count < worker->work_items_size / 2)) {
-               worker->work_items_size -= 64;
-               worker->work_items = g_renew (ThreadPoolWorkItem, worker->work_items, worker->work_items_size);
+       if (G_UNLIKELY (worker.work_items_count >= 64 * 3 && worker.work_items_count < worker.work_items_size / 2)) {
+               worker.work_items_size -= 64;
+               worker.work_items = g_renew (ThreadPoolWorkItem, worker.work_items, worker.work_items_size);
        }
 
-       work_item_unlock (worker);
+       work_item_unlock ();
 
        return TRUE;
 }
 
 static gint32
-work_item_count (MonoThreadPoolWorker *worker)
+work_item_count (void)
 {
        gint32 count;
 
-       work_item_lock (worker);
-       count = worker->work_items_count;
-       work_item_unlock (worker);
+       work_item_lock ();
+       count = worker.work_items_count;
+       work_item_unlock ();
 
        return count;
 }
 
-static void worker_request (MonoThreadPoolWorker *worker);
+static void worker_request (void);
 
 void
-mono_threadpool_worker_enqueue (MonoThreadPoolWorker *worker, MonoThreadPoolWorkerCallback callback, gpointer data)
+mono_threadpool_worker_enqueue (MonoThreadPoolWorkerCallback callback, gpointer data)
 {
-       work_item_push (worker, callback, data);
+       if (!mono_refcount_tryinc (&worker))
+               return;
+
+       work_item_push (callback, data);
+
+       worker_request ();
 
-       worker_request (worker);
+       mono_refcount_dec (&worker);
 }
 
 static void
-worker_wait_interrupt (gpointer data)
+worker_wait_interrupt (gpointer unused)
 {
-       MonoThreadPoolWorker *worker;
+       /* If the runtime is not shutting down, we are not using this mechanism to wake up a unparked thread, and if the
+        * runtime is shutting down, then we need to wake up ALL the threads.
+        * It might be a bit wasteful, but I witnessed shutdown hang where the main thread would abort and then wait for all
+        * background threads to exit (see mono_thread_manage). This would go wrong because not all threadpool threads would
+        * be unparked. It would end up getting unstucked because of the timeout, but that would delay shutdown by 5-60s. */
+       if (!mono_runtime_is_shutting_down ())
+               return;
 
-       worker = (MonoThreadPoolWorker*) data;
-       g_assert (worker);
+       if (!mono_refcount_tryinc (&worker))
+               return;
 
-       mono_coop_mutex_lock (&worker->threads_lock);
-       mono_coop_cond_signal (&worker->parked_threads_cond);
-       mono_coop_mutex_unlock (&worker->threads_lock);
+       mono_coop_mutex_lock (&worker.parked_threads_lock);
+       mono_coop_cond_broadcast (&worker.parked_threads_cond);
+       mono_coop_mutex_unlock (&worker.parked_threads_lock);
 
-       mono_refcount_dec (worker);
+       mono_refcount_dec (&worker);
 }
 
 /* return TRUE if timeout, FALSE otherwise (worker unpark or interrupt) */
 static gboolean
-worker_park (MonoThreadPoolWorker *worker)
+worker_park (void)
 {
        gboolean timeout = FALSE;
+       gboolean interrupted = FALSE;
 
-       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] worker parking", mono_native_thread_id_get ());
+       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] worker parking", mono_native_thread_id_get ());
 
-       mono_coop_mutex_lock (&worker->threads_lock);
+       mono_coop_mutex_lock (&worker.parked_threads_lock);
 
        if (!mono_runtime_is_shutting_down ()) {
                static gpointer rand_handle = NULL;
                MonoInternalThread *thread;
-               gboolean interrupted = FALSE;
                ThreadPoolWorkerCounter counter;
 
                if (!rand_handle)
@@ -487,55 +450,52 @@ worker_park (MonoThreadPoolWorker *worker)
                thread = mono_thread_internal_current ();
                g_assert (thread);
 
-               COUNTER_ATOMIC (worker, counter, {
+               COUNTER_ATOMIC (counter, {
                        counter._.working --;
                        counter._.parked ++;
                });
 
-               worker->parked_threads_count += 1;
+               worker.parked_threads_count += 1;
 
-               mono_thread_info_install_interrupt (worker_wait_interrupt, mono_refcount_inc (worker), &interrupted);
-               if (interrupted) {
-                       mono_refcount_dec (worker);
+               mono_thread_info_install_interrupt (worker_wait_interrupt, NULL, &interrupted);
+               if (interrupted)
                        goto done;
-               }
 
-               if (mono_coop_cond_timedwait (&worker->parked_threads_cond, &worker->threads_lock, rand_next (&rand_handle, 5 * 1000, 60 * 1000)) != 0)
+               if (mono_coop_cond_timedwait (&worker.parked_threads_cond, &worker.parked_threads_lock, rand_next (&rand_handle, 5 * 1000, 60 * 1000)) != 0)
                        timeout = TRUE;
 
                mono_thread_info_uninstall_interrupt (&interrupted);
-               if (!interrupted)
-                       mono_refcount_dec (worker);
 
 done:
-               worker->parked_threads_count -= 1;
+               worker.parked_threads_count -= 1;
 
-               COUNTER_ATOMIC (worker, counter, {
+               COUNTER_ATOMIC (counter, {
                        counter._.working ++;
                        counter._.parked --;
                });
        }
 
-       mono_coop_mutex_unlock (&worker->threads_lock);
+       mono_coop_mutex_unlock (&worker.parked_threads_lock);
 
-       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] worker unparking, timeout? %s", mono_native_thread_id_get (), timeout ? "yes" : "no");
+       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] worker unparking, timeout? %s interrupted? %s",
+               mono_native_thread_id_get (), timeout ? "yes" : "no", interrupted ? "yes" : "no");
 
        return timeout;
 }
 
 static gboolean
-worker_try_unpark (MonoThreadPoolWorker *worker)
+worker_try_unpark (void)
 {
        gboolean res = FALSE;
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try unpark worker", mono_native_thread_id_get ());
 
-       mono_coop_mutex_lock (&worker->threads_lock);
-       if (worker->parked_threads_count > 0) {
-               mono_coop_cond_signal (&worker->parked_threads_cond);
+       mono_coop_mutex_lock (&worker.parked_threads_lock);
+       if (worker.parked_threads_count > 0) {
+               mono_coop_cond_signal (&worker.parked_threads_cond);
                res = TRUE;
        }
-       mono_coop_mutex_unlock (&worker->threads_lock);
+       mono_coop_mutex_unlock (&worker.parked_threads_lock);
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try unpark worker, success? %s", mono_native_thread_id_get (), res ? "yes" : "no");
 
@@ -543,18 +503,17 @@ worker_try_unpark (MonoThreadPoolWorker *worker)
 }
 
 static gsize WINAPI
-worker_thread (gpointer data)
+worker_thread (gpointer unused)
 {
-       MonoThreadPoolWorker *worker;
        MonoInternalThread *thread;
        ThreadPoolWorkerCounter counter;
 
        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] worker starting", mono_native_thread_id_get ());
 
-       worker = (MonoThreadPoolWorker*) data;
-       g_assert (worker);
+       if (!mono_refcount_tryinc (&worker))
+               return 0;
 
-       COUNTER_ATOMIC (worker, counter, {
+       COUNTER_ATOMIC (counter, {
                counter._.starting --;
                counter._.working ++;
        });
@@ -562,20 +521,16 @@ worker_thread (gpointer data)
        thread = mono_thread_internal_current ();
        g_assert (thread);
 
-       mono_coop_mutex_lock (&worker->threads_lock);
-       g_ptr_array_add (worker->threads, thread);
-       mono_coop_mutex_unlock (&worker->threads_lock);
-
        while (!mono_runtime_is_shutting_down ()) {
                ThreadPoolWorkItem work_item;
 
                if (mono_thread_interruption_checkpoint ())
                        continue;
 
-               if (!work_item_try_pop (worker, &work_item)) {
+               if (!work_item_try_pop (&work_item)) {
                        gboolean timeout;
 
-                       timeout = worker_park (worker);
+                       timeout = worker_park ();
                        if (timeout)
                                break;
 
@@ -588,27 +543,19 @@ worker_thread (gpointer data)
                work_item.callback (work_item.data);
        }
 
-       mono_coop_mutex_lock (&worker->threads_lock);
-
-       COUNTER_ATOMIC (worker, counter, {
+       COUNTER_ATOMIC (counter, {
                counter._.working --;
        });
 
-       g_ptr_array_remove (worker->threads, thread);
-
-       mono_coop_cond_signal (&worker->threads_exit_cond);
-
-       mono_coop_mutex_unlock (&worker->threads_lock);
-
        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] worker finishing", mono_native_thread_id_get ());
 
-       mono_refcount_dec (worker);
+       mono_refcount_dec (&worker);
 
        return 0;
 }
 
 static gboolean
-worker_try_create (MonoThreadPoolWorker *worker)
+worker_try_create (void)
 {
        MonoError error;
        MonoInternalThread *thread;
@@ -619,7 +566,7 @@ worker_try_create (MonoThreadPoolWorker *worker)
        if (mono_runtime_is_shutting_down ())
                return FALSE;
 
-       mono_coop_mutex_lock (&worker->worker_creation_lock);
+       mono_coop_mutex_lock (&worker.worker_creation_lock);
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker", mono_native_thread_id_get ());
 
@@ -628,73 +575,69 @@ worker_try_create (MonoThreadPoolWorker *worker)
                g_warning ("failed to get 100ns ticks");
        } else {
                now = current_ticks / (10 * 1000 * 1000);
-               if (worker->worker_creation_current_second != now) {
-                       worker->worker_creation_current_second = now;
-                       worker->worker_creation_current_count = 0;
+               if (worker.worker_creation_current_second != now) {
+                       worker.worker_creation_current_second = now;
+                       worker.worker_creation_current_count = 0;
                } else {
-                       g_assert (worker->worker_creation_current_count <= WORKER_CREATION_MAX_PER_SEC);
-                       if (worker->worker_creation_current_count == WORKER_CREATION_MAX_PER_SEC) {
+                       g_assert (worker.worker_creation_current_count <= WORKER_CREATION_MAX_PER_SEC);
+                       if (worker.worker_creation_current_count == WORKER_CREATION_MAX_PER_SEC) {
                                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: maximum number of worker created per second reached, current count = %d",
-                                       mono_native_thread_id_get (), worker->worker_creation_current_count);
-                               mono_coop_mutex_unlock (&worker->worker_creation_lock);
+                                       mono_native_thread_id_get (), worker.worker_creation_current_count);
+                               mono_coop_mutex_unlock (&worker.worker_creation_lock);
                                return FALSE;
                        }
                }
        }
 
-       COUNTER_ATOMIC (worker, counter, {
+       COUNTER_ATOMIC (counter, {
                if (counter._.working >= counter._.max_working) {
                        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: maximum number of working threads reached",
                                mono_native_thread_id_get ());
-                       mono_coop_mutex_unlock (&worker->worker_creation_lock);
+                       mono_coop_mutex_unlock (&worker.worker_creation_lock);
                        return FALSE;
                }
                counter._.starting ++;
        });
 
-       thread = mono_thread_create_internal (mono_get_root_domain (), worker_thread, mono_refcount_inc (worker), TRUE, 0, &error);
+       thread = mono_thread_create_internal (mono_get_root_domain (), worker_thread, NULL, TRUE, 0, &error);
        if (!thread) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: could not create thread due to %s", mono_native_thread_id_get (), mono_error_get_message (&error));
                mono_error_cleanup (&error);
 
-               COUNTER_ATOMIC (worker, counter, {
+               COUNTER_ATOMIC (counter, {
                        counter._.starting --;
                });
 
-               mono_coop_mutex_unlock (&worker->worker_creation_lock);
-
-               mono_refcount_dec (worker);
+               mono_coop_mutex_unlock (&worker.worker_creation_lock);
 
                return FALSE;
        }
 
-       worker->worker_creation_current_count += 1;
+       worker.worker_creation_current_count += 1;
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, created %p, now = %d count = %d",
-               mono_native_thread_id_get (), (gpointer) thread->tid, now, worker->worker_creation_current_count);
+               mono_native_thread_id_get (), (gpointer) thread->tid, now, worker.worker_creation_current_count);
 
-       mono_coop_mutex_unlock (&worker->worker_creation_lock);
+       mono_coop_mutex_unlock (&worker.worker_creation_lock);
        return TRUE;
 }
 
-static void monitor_ensure_running (MonoThreadPoolWorker *worker);
+static void monitor_ensure_running (void);
 
 static void
-worker_request (MonoThreadPoolWorker *worker)
+worker_request (void)
 {
-       g_assert (worker);
-
-       if (worker->suspended)
+       if (worker.suspended)
                return;
 
-       monitor_ensure_running (worker);
+       monitor_ensure_running ();
 
-       if (worker_try_unpark (worker)) {
+       if (worker_try_unpark ()) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] request worker, unparked", mono_native_thread_id_get ());
                return;
        }
 
-       if (worker_try_create (worker)) {
+       if (worker_try_create ()) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] request worker, created", mono_native_thread_id_get ());
                return;
        }
@@ -703,19 +646,19 @@ worker_request (MonoThreadPoolWorker *worker)
 }
 
 static gboolean
-monitor_should_keep_running (MonoThreadPoolWorker *worker)
+monitor_should_keep_running (void)
 {
        static gint64 last_should_keep_running = -1;
 
-       g_assert (worker->monitor_status == MONITOR_STATUS_WAITING_FOR_REQUEST || worker->monitor_status == MONITOR_STATUS_REQUESTED);
+       g_assert (worker.monitor_status == MONITOR_STATUS_WAITING_FOR_REQUEST || worker.monitor_status == MONITOR_STATUS_REQUESTED);
 
-       if (InterlockedExchange (&worker->monitor_status, MONITOR_STATUS_WAITING_FOR_REQUEST) == MONITOR_STATUS_WAITING_FOR_REQUEST) {
+       if (InterlockedExchange (&worker.monitor_status, MONITOR_STATUS_WAITING_FOR_REQUEST) == MONITOR_STATUS_WAITING_FOR_REQUEST) {
                gboolean should_keep_running = TRUE, force_should_keep_running = FALSE;
 
                if (mono_runtime_is_shutting_down ()) {
                        should_keep_running = FALSE;
                } else {
-                       if (work_item_count (worker) == 0)
+                       if (work_item_count () == 0)
                                should_keep_running = FALSE;
 
                        if (!should_keep_running) {
@@ -730,50 +673,47 @@ monitor_should_keep_running (MonoThreadPoolWorker *worker)
                                last_should_keep_running = mono_100ns_ticks ();
                } else {
                        last_should_keep_running = -1;
-                       if (InterlockedCompareExchange (&worker->monitor_status, MONITOR_STATUS_NOT_RUNNING, MONITOR_STATUS_WAITING_FOR_REQUEST) == MONITOR_STATUS_WAITING_FOR_REQUEST)
+                       if (InterlockedCompareExchange (&worker.monitor_status, MONITOR_STATUS_NOT_RUNNING, MONITOR_STATUS_WAITING_FOR_REQUEST) == MONITOR_STATUS_WAITING_FOR_REQUEST)
                                return FALSE;
                }
        }
 
-       g_assert (worker->monitor_status == MONITOR_STATUS_WAITING_FOR_REQUEST || worker->monitor_status == MONITOR_STATUS_REQUESTED);
+       g_assert (worker.monitor_status == MONITOR_STATUS_WAITING_FOR_REQUEST || worker.monitor_status == MONITOR_STATUS_REQUESTED);
 
        return TRUE;
 }
 
 static gboolean
-monitor_sufficient_delay_since_last_dequeue (MonoThreadPoolWorker *worker)
+monitor_sufficient_delay_since_last_dequeue (void)
 {
        gint64 threshold;
 
-       g_assert (worker);
-
-       if (worker->cpu_usage < CPU_USAGE_LOW) {
+       if (worker.cpu_usage < CPU_USAGE_LOW) {
                threshold = MONITOR_INTERVAL;
        } else {
                ThreadPoolWorkerCounter counter;
-               counter = COUNTER_READ (worker);
+               counter = COUNTER_READ ();
                threshold = counter._.max_working * MONITOR_INTERVAL * 2;
        }
 
-       return mono_msec_ticks () >= worker->heuristic_last_dequeue + threshold;
+       return mono_msec_ticks () >= worker.heuristic_last_dequeue + threshold;
 }
 
-static void hill_climbing_force_change (MonoThreadPoolWorker *worker, gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition);
+static void hill_climbing_force_change (gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition);
 
 static gsize WINAPI
-monitor_thread (gpointer data)
+monitor_thread (gpointer unused)
 {
-       MonoThreadPoolWorker *worker;
        MonoInternalThread *internal;
        guint i;
 
-       worker = (MonoThreadPoolWorker*) data;
-       g_assert (worker);
+       if (!mono_refcount_tryinc (&worker))
+               return 0;
 
        internal = mono_thread_internal_current ();
        g_assert (internal);
 
-       mono_cpu_usage (worker->cpu_usage_state);
+       mono_cpu_usage (worker.cpu_usage_state);
 
        // printf ("monitor_thread: start\n");
 
@@ -785,9 +725,9 @@ monitor_thread (gpointer data)
                gint32 interval_left = MONITOR_INTERVAL;
                gint32 awake = 0; /* number of spurious awakes we tolerate before doing a round of rebalancing */
 
-               g_assert (worker->monitor_status != MONITOR_STATUS_NOT_RUNNING);
+               g_assert (worker.monitor_status != MONITOR_STATUS_NOT_RUNNING);
 
-               // counter = COUNTER_READ (worker);
+               // counter = COUNTER_READ ();
                // printf ("monitor_thread: starting = %d working = %d parked = %d max_working = %d\n",
                //      counter._.starting, counter._.working, counter._.parked, counter._.max_working);
 
@@ -810,21 +750,21 @@ monitor_thread (gpointer data)
                if (mono_runtime_is_shutting_down ())
                        continue;
 
-               if (worker->suspended)
+               if (worker.suspended)
                        continue;
 
-               if (work_item_count (worker) == 0)
+               if (work_item_count () == 0)
                        continue;
 
-               worker->cpu_usage = mono_cpu_usage (worker->cpu_usage_state);
+               worker.cpu_usage = mono_cpu_usage (worker.cpu_usage_state);
 
-               if (!monitor_sufficient_delay_since_last_dequeue (worker))
+               if (!monitor_sufficient_delay_since_last_dequeue ())
                        continue;
 
                limit_worker_max_reached = FALSE;
 
-               COUNTER_ATOMIC (worker, counter, {
-                       if (counter._.max_working >= worker->limit_worker_max) {
+               COUNTER_ATOMIC (counter, {
+                       if (counter._.max_working >= worker.limit_worker_max) {
                                limit_worker_max_reached = TRUE;
                                break;
                        }
@@ -834,54 +774,56 @@ monitor_thread (gpointer data)
                if (limit_worker_max_reached)
                        continue;
 
-               hill_climbing_force_change (worker, counter._.max_working, TRANSITION_STARVATION);
+               hill_climbing_force_change (counter._.max_working, TRANSITION_STARVATION);
 
                for (i = 0; i < 5; ++i) {
                        if (mono_runtime_is_shutting_down ())
                                break;
 
-                       if (worker_try_unpark (worker)) {
+                       if (worker_try_unpark ()) {
                                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] monitor thread, unparked", mono_native_thread_id_get ());
                                break;
                        }
 
-                       if (worker_try_create (worker)) {
+                       if (worker_try_create ()) {
                                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] monitor thread, created", mono_native_thread_id_get ());
                                break;
                        }
                }
-       } while (monitor_should_keep_running (worker));
+       } while (monitor_should_keep_running ());
 
        // printf ("monitor_thread: stop\n");
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] monitor thread, finished", mono_native_thread_id_get ());
 
+       mono_refcount_dec (&worker);
        return 0;
 }
 
 static void
-monitor_ensure_running (MonoThreadPoolWorker *worker)
+monitor_ensure_running (void)
 {
        MonoError error;
        for (;;) {
-               switch (worker->monitor_status) {
+               switch (worker.monitor_status) {
                case MONITOR_STATUS_REQUESTED:
                        // printf ("monitor_thread: requested\n");
                        return;
                case MONITOR_STATUS_WAITING_FOR_REQUEST:
                        // printf ("monitor_thread: waiting for request\n");
-                       InterlockedCompareExchange (&worker->monitor_status, MONITOR_STATUS_REQUESTED, MONITOR_STATUS_WAITING_FOR_REQUEST);
+                       InterlockedCompareExchange (&worker.monitor_status, MONITOR_STATUS_REQUESTED, MONITOR_STATUS_WAITING_FOR_REQUEST);
                        break;
                case MONITOR_STATUS_NOT_RUNNING:
                        // printf ("monitor_thread: not running\n");
                        if (mono_runtime_is_shutting_down ())
                                return;
-                       if (InterlockedCompareExchange (&worker->monitor_status, MONITOR_STATUS_REQUESTED, MONITOR_STATUS_NOT_RUNNING) == MONITOR_STATUS_NOT_RUNNING) {
+                       if (InterlockedCompareExchange (&worker.monitor_status, MONITOR_STATUS_REQUESTED, MONITOR_STATUS_NOT_RUNNING) == MONITOR_STATUS_NOT_RUNNING) {
                                // printf ("monitor_thread: creating\n");
-                               if (!mono_thread_create_internal (mono_get_root_domain (), monitor_thread, worker, TRUE, SMALL_STACK, &error)) {
+                               if (!mono_thread_create_internal (mono_get_root_domain (), monitor_thread, NULL, TRUE, SMALL_STACK, &error)) {
                                        // printf ("monitor_thread: creating failed\n");
-                                       worker->monitor_status = MONITOR_STATUS_NOT_RUNNING;
+                                       worker.monitor_status = MONITOR_STATUS_NOT_RUNNING;
                                        mono_error_cleanup (&error);
+                                       mono_refcount_dec (&worker);
                                }
                                return;
                        }
@@ -892,15 +834,13 @@ monitor_ensure_running (MonoThreadPoolWorker *worker)
 }
 
 static void
-hill_climbing_change_thread_count (MonoThreadPoolWorker *worker, gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition)
+hill_climbing_change_thread_count (gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition)
 {
        ThreadPoolHillClimbing *hc;
 
-       g_assert (worker);
-
-       hc = &worker->heuristic_hill_climbing;
+       hc = &worker.heuristic_hill_climbing;
 
-       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] hill climbing, change max number of threads %d", mono_native_thread_id_get (), new_thread_count);
+       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] hill climbing, change max number of threads %d", mono_native_thread_id_get (), new_thread_count);
 
        hc->last_thread_count = new_thread_count;
        hc->current_sample_interval = rand_next (&hc->random_interval_generator, hc->sample_interval_low, hc->sample_interval_high);
@@ -909,32 +849,29 @@ hill_climbing_change_thread_count (MonoThreadPoolWorker *worker, gint16 new_thre
 }
 
 static void
-hill_climbing_force_change (MonoThreadPoolWorker *worker, gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition)
+hill_climbing_force_change (gint16 new_thread_count, ThreadPoolHeuristicStateTransition transition)
 {
        ThreadPoolHillClimbing *hc;
 
-       g_assert (worker);
-
-       hc = &worker->heuristic_hill_climbing;
+       hc = &worker.heuristic_hill_climbing;
 
        if (new_thread_count != hc->last_thread_count) {
                hc->current_control_setting += new_thread_count - hc->last_thread_count;
-               hill_climbing_change_thread_count (worker, new_thread_count, transition);
+               hill_climbing_change_thread_count (new_thread_count, transition);
        }
 }
 
 static double_complex
-hill_climbing_get_wave_component (MonoThreadPoolWorker *worker, gdouble *samples, guint sample_count, gdouble period)
+hill_climbing_get_wave_component (gdouble *samples, guint sample_count, gdouble period)
 {
        ThreadPoolHillClimbing *hc;
        gdouble w, cosine, sine, coeff, q0, q1, q2;
        guint i;
 
-       g_assert (worker);
        g_assert (sample_count >= period);
        g_assert (period >= 2);
 
-       hc = &worker->heuristic_hill_climbing;
+       hc = &worker.heuristic_hill_climbing;
 
        w = 2.0 * M_PI / period;
        cosine = cos (w);
@@ -952,7 +889,7 @@ hill_climbing_get_wave_component (MonoThreadPoolWorker *worker, gdouble *samples
 }
 
 static gint16
-hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count, guint32 sample_duration, gint32 completions, gint64 *adjustment_interval)
+hill_climbing_update (gint16 current_thread_count, guint32 sample_duration, gint32 completions, gint64 *adjustment_interval)
 {
        ThreadPoolHillClimbing *hc;
        ThreadPoolHeuristicStateTransition transition;
@@ -969,14 +906,13 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
        double_complex throughput_wave_component;
        double_complex ratio;
 
-       g_assert (worker);
        g_assert (adjustment_interval);
 
-       hc = &worker->heuristic_hill_climbing;
+       hc = &worker.heuristic_hill_climbing;
 
        /* If someone changed the thread count without telling us, update our records accordingly. */
        if (current_thread_count != hc->last_thread_count)
-               hill_climbing_force_change (worker, current_thread_count, TRANSITION_INITIALIZING);
+               hill_climbing_force_change (current_thread_count, TRANSITION_INITIALIZING);
 
        /* Update the cumulative stats for this thread count */
        hc->elapsed_since_last_change += sample_duration;
@@ -1007,7 +943,7 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
         * range we're targeting, which will not be filtered by the frequency-domain translation. */
        if (hc->total_samples > 0 && ((current_thread_count - 1.0) / completions) >= hc->max_sample_error) {
                /* Not accurate enough yet. Let's accumulate the data so
-                * far, and tell the MonoThreadPoolWorker to collect a little more. */
+                * far, and tell the ThreadPoolWorker to collect a little more. */
                hc->accumulated_sample_duration = sample_duration;
                hc->accumulated_completion_count = completions;
                *adjustment_interval = 10;
@@ -1068,17 +1004,17 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
                        /* Get the the three different frequency components of the throughput (scaled by average
                         * throughput). Our "error" estimate (the amount of noise that might be present in the
                         * frequency band we're really interested in) is the average of the adjacent bands. */
-                       throughput_wave_component = mono_double_complex_scalar_div (hill_climbing_get_wave_component (worker, hc->samples, sample_count, hc->wave_period), average_throughput);
-                       throughput_error_estimate = cabs (mono_double_complex_scalar_div (hill_climbing_get_wave_component (worker, hc->samples, sample_count, adjacent_period_1), average_throughput));
+                       throughput_wave_component = mono_double_complex_scalar_div (hill_climbing_get_wave_component (hc->samples, sample_count, hc->wave_period), average_throughput);
+                       throughput_error_estimate = cabs (mono_double_complex_scalar_div (hill_climbing_get_wave_component (hc->samples, sample_count, adjacent_period_1), average_throughput));
 
                        if (adjacent_period_2 <= sample_count) {
                                throughput_error_estimate = MAX (throughput_error_estimate, cabs (mono_double_complex_scalar_div (hill_climbing_get_wave_component (
-                                       worker, hc->samples, sample_count, adjacent_period_2), average_throughput)));
+                                       hc->samples, sample_count, adjacent_period_2), average_throughput)));
                        }
 
                        /* Do the same for the thread counts, so we have something to compare to. We don't
                         * measure thread count noise, because there is none; these are exact measurements. */
-                       thread_wave_component = mono_double_complex_scalar_div (hill_climbing_get_wave_component (worker, hc->thread_counts, sample_count, hc->wave_period), average_thread_count);
+                       thread_wave_component = mono_double_complex_scalar_div (hill_climbing_get_wave_component (hc->thread_counts, sample_count, hc->wave_period), average_thread_count);
 
                        /* Update our moving average of the throughput noise. We'll use this
                         * later as feedback to determine the new size of the thread wave. */
@@ -1129,7 +1065,7 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
        move = MIN (move, hc->max_change_per_sample);
 
        /* If the result was positive, and CPU is > 95%, refuse the move. */
-       if (move > 0.0 && worker->cpu_usage > CPU_USAGE_HIGH)
+       if (move > 0.0 && worker.cpu_usage > CPU_USAGE_HIGH)
                move = 0.0;
 
        /* Apply the move to our control setting. */
@@ -1141,19 +1077,19 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
                * hc->target_signal_to_noise_ratio * hc->thread_magnitude_multiplier * 2.0));
        new_thread_wave_magnitude = CLAMP (new_thread_wave_magnitude, 1, hc->max_thread_wave_magnitude);
 
-       /* Make sure our control setting is within the MonoThreadPoolWorker's limits. */
-       hc->current_control_setting = CLAMP (hc->current_control_setting, worker->limit_worker_min, worker->limit_worker_max - new_thread_wave_magnitude);
+       /* Make sure our control setting is within the ThreadPoolWorker's limits. */
+       hc->current_control_setting = CLAMP (hc->current_control_setting, worker.limit_worker_min, worker.limit_worker_max - new_thread_wave_magnitude);
 
        /* Calculate the new thread count (control setting + square wave). */
        new_thread_count = (gint)(hc->current_control_setting + new_thread_wave_magnitude * ((hc->total_samples / (hc->wave_period / 2)) % 2));
 
-       /* Make sure the new thread count doesn't exceed the MonoThreadPoolWorker's limits. */
-       new_thread_count = CLAMP (new_thread_count, worker->limit_worker_min, worker->limit_worker_max);
+       /* Make sure the new thread count doesn't exceed the ThreadPoolWorker's limits. */
+       new_thread_count = CLAMP (new_thread_count, worker.limit_worker_min, worker.limit_worker_max);
 
        if (new_thread_count != current_thread_count)
-               hill_climbing_change_thread_count (worker, new_thread_count, transition);
+               hill_climbing_change_thread_count (new_thread_count, transition);
 
-       if (creal (ratio) < 0.0 && new_thread_count == worker->limit_worker_min)
+       if (creal (ratio) < 0.0 && new_thread_count == worker.limit_worker_min)
                *adjustment_interval = (gint)(0.5 + hc->current_sample_interval * (10.0 * MAX (-1.0 * creal (ratio), 1.0)));
        else
                *adjustment_interval = hc->current_sample_interval;
@@ -1162,11 +1098,11 @@ hill_climbing_update (MonoThreadPoolWorker *worker, gint16 current_thread_count,
 }
 
 static gboolean
-heuristic_should_adjust (MonoThreadPoolWorker *worker)
+heuristic_should_adjust (void)
 {
-       if (worker->heuristic_last_dequeue > worker->heuristic_last_adjustment + worker->heuristic_adjustment_interval) {
+       if (worker.heuristic_last_dequeue > worker.heuristic_last_adjustment + worker.heuristic_adjustment_interval) {
                ThreadPoolWorkerCounter counter;
-               counter = COUNTER_READ (worker);
+               counter = COUNTER_READ ();
                if (counter._.working <= counter._.max_working)
                        return TRUE;
        }
@@ -1175,96 +1111,126 @@ heuristic_should_adjust (MonoThreadPoolWorker *worker)
 }
 
 static void
-heuristic_adjust (MonoThreadPoolWorker *worker)
+heuristic_adjust (void)
 {
-       if (mono_coop_mutex_trylock (&worker->heuristic_lock) == 0) {
-               gint32 completions = InterlockedExchange (&worker->heuristic_completions, 0);
+       if (mono_coop_mutex_trylock (&worker.heuristic_lock) == 0) {
+               gint32 completions = InterlockedExchange (&worker.heuristic_completions, 0);
                gint64 sample_end = mono_msec_ticks ();
-               gint64 sample_duration = sample_end - worker->heuristic_sample_start;
+               gint64 sample_duration = sample_end - worker.heuristic_sample_start;
 
-               if (sample_duration >= worker->heuristic_adjustment_interval / 2) {
+               if (sample_duration >= worker.heuristic_adjustment_interval / 2) {
                        ThreadPoolWorkerCounter counter;
                        gint16 new_thread_count;
 
-                       counter = COUNTER_READ (worker);
-                       new_thread_count = hill_climbing_update (worker, counter._.max_working, sample_duration, completions, &worker->heuristic_adjustment_interval);
+                       counter = COUNTER_READ ();
+                       new_thread_count = hill_climbing_update (counter._.max_working, sample_duration, completions, &worker.heuristic_adjustment_interval);
 
-                       COUNTER_ATOMIC (worker, counter, {
+                       COUNTER_ATOMIC (counter, {
                                counter._.max_working = new_thread_count;
                        });
 
                        if (new_thread_count > counter._.max_working)
-                               worker_request (worker);
+                               worker_request ();
 
-                       worker->heuristic_sample_start = sample_end;
-                       worker->heuristic_last_adjustment = mono_msec_ticks ();
+                       worker.heuristic_sample_start = sample_end;
+                       worker.heuristic_last_adjustment = mono_msec_ticks ();
                }
 
-               mono_coop_mutex_unlock (&worker->heuristic_lock);
+               mono_coop_mutex_unlock (&worker.heuristic_lock);
        }
 }
 
 static void
-heuristic_notify_work_completed (MonoThreadPoolWorker *worker)
+heuristic_notify_work_completed (void)
 {
-       g_assert (worker);
-
-       InterlockedIncrement (&worker->heuristic_completions);
-       worker->heuristic_last_dequeue = mono_msec_ticks ();
+       InterlockedIncrement (&worker.heuristic_completions);
+       worker.heuristic_last_dequeue = mono_msec_ticks ();
 
-       if (heuristic_should_adjust (worker))
-               heuristic_adjust (worker);
+       if (heuristic_should_adjust ())
+               heuristic_adjust ();
 }
 
 gboolean
-mono_threadpool_worker_notify_completed (MonoThreadPoolWorker *worker)
+mono_threadpool_worker_notify_completed (void)
 {
        ThreadPoolWorkerCounter counter;
 
-       heuristic_notify_work_completed (worker);
+       heuristic_notify_work_completed ();
 
-       counter = COUNTER_READ (worker);
+       counter = COUNTER_READ ();
        return counter._.working <= counter._.max_working;
 }
 
 gint32
-mono_threadpool_worker_get_min (MonoThreadPoolWorker *worker)
+mono_threadpool_worker_get_min (void)
 {
-       return worker->limit_worker_min;
+       gint32 ret;
+
+       if (!mono_refcount_tryinc (&worker))
+               return 0;
+
+       ret = worker.limit_worker_min;
+
+       mono_refcount_dec (&worker);
+       return ret;
 }
 
 gboolean
-mono_threadpool_worker_set_min (MonoThreadPoolWorker *worker, gint32 value)
+mono_threadpool_worker_set_min (gint32 value)
 {
-       if (value <= 0 || value > worker->limit_worker_max)
+       if (value <= 0 || value > worker.limit_worker_max)
+               return FALSE;
+
+       if (!mono_refcount_tryinc (&worker))
                return FALSE;
 
-       worker->limit_worker_min = value;
+       worker.limit_worker_min = value;
+
+       mono_refcount_dec (&worker);
        return TRUE;
 }
 
 gint32
-mono_threadpool_worker_get_max (MonoThreadPoolWorker *worker)
+mono_threadpool_worker_get_max (void)
 {
-       return worker->limit_worker_max;
+       gint32 ret;
+
+       if (!mono_refcount_tryinc (&worker))
+               return 0;
+
+       ret = worker.limit_worker_max;
+
+       mono_refcount_dec (&worker);
+       return ret;
 }
 
 gboolean
-mono_threadpool_worker_set_max (MonoThreadPoolWorker *worker, gint32 value)
+mono_threadpool_worker_set_max (gint32 value)
 {
-       gint32 cpu_count = mono_cpu_count ();
+       gint32 cpu_count;
+
+       cpu_count = mono_cpu_count ();
+       if (value < worker.limit_worker_min || value < cpu_count)
+               return FALSE;
 
-       if (value < worker->limit_worker_min || value < cpu_count)
+       if (!mono_refcount_tryinc (&worker))
                return FALSE;
 
-       worker->limit_worker_max = value;
+       worker.limit_worker_max = value;
+
+       mono_refcount_dec (&worker);
        return TRUE;
 }
 
 void
-mono_threadpool_worker_set_suspended (MonoThreadPoolWorker *worker, gboolean suspended)
+mono_threadpool_worker_set_suspended (gboolean suspended)
 {
-       worker->suspended = suspended;
+       if (!mono_refcount_tryinc (&worker))
+               return;
+
+       worker.suspended = suspended;
        if (!suspended)
-               worker_request (worker);
+               worker_request ();
+
+       mono_refcount_dec (&worker);
 }
index b63df60c915cb58defd2111979f0442805c79ea0..00cf11d64d09132ed4f7e120ea7bd9f0c95c69a4 100644 (file)
@@ -2,33 +2,33 @@
 #ifndef _MONO_METADATA_THREADPOOL_WORKER_H
 #define _MONO_METADATA_THREADPOOL_WORKER_H
 
-typedef struct MonoThreadPoolWorker MonoThreadPoolWorker;
+#include <glib.h>
 
 typedef void (*MonoThreadPoolWorkerCallback)(gpointer);
 
 void
-mono_threadpool_worker_init (MonoThreadPoolWorker **worker);
+mono_threadpool_worker_init (void);
 
 void
-mono_threadpool_worker_cleanup (MonoThreadPoolWorker *worker);
+mono_threadpool_worker_cleanup (void);
 
 void
-mono_threadpool_worker_enqueue (MonoThreadPoolWorker *worker, MonoThreadPoolWorkerCallback callback, gpointer data);
+mono_threadpool_worker_enqueue (MonoThreadPoolWorkerCallback callback, gpointer data);
 
 gboolean
-mono_threadpool_worker_notify_completed (MonoThreadPoolWorker *worker);
+mono_threadpool_worker_notify_completed (void);
 
 gint32
-mono_threadpool_worker_get_min (MonoThreadPoolWorker *worker);
+mono_threadpool_worker_get_min (void);
 gboolean
-mono_threadpool_worker_set_min (MonoThreadPoolWorker *worker, gint32 value);
+mono_threadpool_worker_set_min (gint32 value);
 
 gint32
-mono_threadpool_worker_get_max (MonoThreadPoolWorker *worker);
+mono_threadpool_worker_get_max (void);
 gboolean
-mono_threadpool_worker_set_max (MonoThreadPoolWorker *worker, gint32 value);
+mono_threadpool_worker_set_max (gint32 value);
 
 void
-mono_threadpool_worker_set_suspended (MonoThreadPoolWorker *worker, gboolean suspended);
+mono_threadpool_worker_set_suspended (gboolean suspended);
 
 #endif /* _MONO_METADATA_THREADPOOL_WORKER_H */
index c1f0c1a12a9f233f0dc41f902b60d7d2c6570abf..f3ff6b6ac7d061d0bd9cbb0214bffed9ed37ecfb 100644 (file)
@@ -53,7 +53,7 @@ typedef struct {
        /* Number of currently executing jobs */
        gint32 threadpool_jobs;
        /* Signalled when threadpool_jobs + outstanding_request is 0 */
-       /* Protected by threadpool->domains_lock */
+       /* Protected by threadpool.domains_lock */
        MonoCoopCond cleanup_cond;
 } ThreadPoolDomain;
 
@@ -71,146 +71,78 @@ typedef struct {
        GPtrArray *domains; // ThreadPoolDomain* []
        MonoCoopMutex domains_lock;
 
-       GPtrArray *threads; // MonoInternalThread* []
-       MonoCoopMutex threads_lock;
-       MonoCoopCond threads_exit_cond;
-
        ThreadPoolCounter counters;
 
        gint32 limit_io_min;
        gint32 limit_io_max;
-
-       MonoThreadPoolWorker *worker;
 } ThreadPool;
 
 static mono_lazy_init_t status = MONO_LAZY_INIT_STATUS_NOT_INITIALIZED;
 
-static ThreadPool* threadpool;
+static ThreadPool threadpool;
 
-#define COUNTER_ATOMIC(threadpool,var,block) \
+#define COUNTER_ATOMIC(var,block) \
        do { \
                ThreadPoolCounter __old; \
                do { \
-                       g_assert (threadpool); \
-                       (var) = __old = COUNTER_READ (threadpool); \
+                       (var) = __old = COUNTER_READ (); \
                        { block; } \
                        if (!(counter._.starting >= 0)) \
                                g_error ("%s: counter._.starting = %d, but should be >= 0", __func__, counter._.starting); \
                        if (!(counter._.working >= 0)) \
                                g_error ("%s: counter._.working = %d, but should be >= 0", __func__, counter._.working); \
-               } while (InterlockedCompareExchange (&threadpool->counters.as_gint32, (var).as_gint32, __old.as_gint32) != __old.as_gint32); \
+               } while (InterlockedCompareExchange (&threadpool.counters.as_gint32, (var).as_gint32, __old.as_gint32) != __old.as_gint32); \
        } while (0)
 
 static inline ThreadPoolCounter
-COUNTER_READ (ThreadPool *threadpool)
+COUNTER_READ (void)
 {
        ThreadPoolCounter counter;
-       counter.as_gint32 = InterlockedRead (&threadpool->counters.as_gint32);
+       counter.as_gint32 = InterlockedRead (&threadpool.counters.as_gint32);
        return counter;
 }
 
 static inline void
 domains_lock (void)
 {
-       mono_coop_mutex_lock (&threadpool->domains_lock);
+       mono_coop_mutex_lock (&threadpool.domains_lock);
 }
 
 static inline void
 domains_unlock (void)
 {
-       mono_coop_mutex_unlock (&threadpool->domains_lock);
+       mono_coop_mutex_unlock (&threadpool.domains_lock);
 }
 
 static void
 destroy (gpointer unused)
 {
-       g_ptr_array_free (threadpool->domains, TRUE);
-       mono_coop_mutex_destroy (&threadpool->domains_lock);
-
-       g_ptr_array_free (threadpool->threads, TRUE);
-       mono_coop_mutex_destroy (&threadpool->threads_lock);
-       mono_coop_cond_destroy (&threadpool->threads_exit_cond);
-
-       /* We cannot free the threadpool, because there is a race
-        * on shutdown where a managed thread may request a new
-        * threadpool thread, but we already destroyed the
-        * threadpool. So to avoid a use-after-free, we simply do
-        * not free the threadpool, as we won't be able to access
-        * the threadpool anyway because the ref count will be 0 */
-       // g_free (threadpool);
+       g_ptr_array_free (threadpool.domains, TRUE);
+       mono_coop_mutex_destroy (&threadpool.domains_lock);
 }
 
 static void
 initialize (void)
 {
-       g_assert (!threadpool);
-       threadpool = g_new0 (ThreadPool, 1);
-       g_assert (threadpool);
-
        g_assert (sizeof (ThreadPoolCounter) == sizeof (gint32));
 
-       mono_refcount_init (threadpool, destroy);
+       mono_refcount_init (&threadpool, destroy);
 
-       threadpool->domains = g_ptr_array_new ();
-       mono_coop_mutex_init (&threadpool->domains_lock);
+       threadpool.domains = g_ptr_array_new ();
+       mono_coop_mutex_init (&threadpool.domains_lock);
 
-       threadpool->threads = g_ptr_array_new ();
-       mono_coop_mutex_init (&threadpool->threads_lock);
-       mono_coop_cond_init (&threadpool->threads_exit_cond);
+       threadpool.limit_io_min = mono_cpu_count ();
+       threadpool.limit_io_max = CLAMP (threadpool.limit_io_min * 100, MIN (threadpool.limit_io_min, 200), MAX (threadpool.limit_io_min, 200));
 
-       threadpool->limit_io_min = mono_cpu_count ();
-       threadpool->limit_io_max = CLAMP (threadpool->limit_io_min * 100, MIN (threadpool->limit_io_min, 200), MAX (threadpool->limit_io_min, 200));
-
-       mono_threadpool_worker_init (&threadpool->worker);
+       mono_threadpool_worker_init ();
 }
 
 static void
 cleanup (void)
 {
-       guint i;
-       MonoInternalThread *current;
-
-       /* we make the assumption along the code that we are
-        * cleaning up only if the runtime is shutting down */
-       g_assert (mono_runtime_is_shutting_down ());
-
-       current = mono_thread_internal_current ();
-
-       mono_coop_mutex_lock (&threadpool->threads_lock);
-
-       /* stop all threadpool->threads */
-       for (i = 0; i < threadpool->threads->len; ++i) {
-               MonoInternalThread *thread = (MonoInternalThread*) g_ptr_array_index (threadpool->threads, i);
-               if (thread != current)
-                       mono_thread_internal_abort (thread);
-       }
-
-       mono_coop_mutex_unlock (&threadpool->threads_lock);
-
-#if 0
-       /* give a chance to the other threads to exit */
-       mono_thread_info_yield ();
-
-       mono_coop_mutex_lock (&threadpool->threads_lock);
-
-       for (;;) {
-               if (threadpool->threads->len == 0)
-                       break;
-
-               if (threadpool->threads->len == 1 && g_ptr_array_index (threadpool->threads, 0) == current) {
-                       /* We are waiting on ourselves */
-                       break;
-               }
-
-               mono_coop_cond_wait (&threadpool->threads_exit_cond, &threadpool->threads_lock);
-       }
-
-       mono_coop_mutex_unlock (&threadpool->threads_lock);
-#endif
+       mono_threadpool_worker_cleanup ();
 
-       mono_threadpool_worker_cleanup (threadpool->worker);
-
-       mono_refcount_dec (threadpool);
+       mono_refcount_dec (&threadpool);
 }
 
 gboolean
@@ -256,22 +188,19 @@ mono_threadpool_enqueue_work_item (MonoDomain *domain, MonoObject *work_item, Mo
        return TRUE;
 }
 
-/* LOCKING: domains_lock must be held */
-static void
-tpdomain_add (ThreadPoolDomain *tpdomain)
+/* LOCKING: domains_lock must be held. */
+static ThreadPoolDomain *
+tpdomain_create (MonoDomain *domain)
 {
-       guint i, len;
+       ThreadPoolDomain *tpdomain;
 
-       g_assert (tpdomain);
+       tpdomain = g_new0 (ThreadPoolDomain, 1);
+       tpdomain->domain = domain;
+       mono_coop_cond_init (&tpdomain->cleanup_cond);
 
-       len = threadpool->domains->len;
-       for (i = 0; i < len; ++i) {
-               if (g_ptr_array_index (threadpool->domains, i) == tpdomain)
-                       break;
-       }
+       g_ptr_array_add (threadpool.domains, tpdomain);
 
-       if (i == len)
-               g_ptr_array_add (threadpool->domains, tpdomain);
+       return tpdomain;
 }
 
 /* LOCKING: domains_lock must be held. */
@@ -279,36 +208,26 @@ static gboolean
 tpdomain_remove (ThreadPoolDomain *tpdomain)
 {
        g_assert (tpdomain);
-       return g_ptr_array_remove (threadpool->domains, tpdomain);
+       return g_ptr_array_remove (threadpool.domains, tpdomain);
 }
 
 /* LOCKING: domains_lock must be held */
 static ThreadPoolDomain *
-tpdomain_get (MonoDomain *domain, gboolean create)
+tpdomain_get (MonoDomain *domain)
 {
-       guint i;
-       ThreadPoolDomain *tpdomain;
+       gint i;
 
        g_assert (domain);
 
-       for (i = 0; i < threadpool->domains->len; ++i) {
+       for (i = 0; i < threadpool.domains->len; ++i) {
                ThreadPoolDomain *tpdomain;
 
-               tpdomain = (ThreadPoolDomain *)g_ptr_array_index (threadpool->domains, i);
+               tpdomain = (ThreadPoolDomain *)g_ptr_array_index (threadpool.domains, i);
                if (tpdomain->domain == domain)
                        return tpdomain;
        }
 
-       if (!create)
-               return NULL;
-
-       tpdomain = g_new0 (ThreadPoolDomain, 1);
-       tpdomain->domain = domain;
-       mono_coop_cond_init (&tpdomain->cleanup_cond);
-
-       tpdomain_add (tpdomain);
-
-       return tpdomain;
+       return NULL;
 }
 
 static void
@@ -322,22 +241,21 @@ static ThreadPoolDomain *
 tpdomain_get_next (ThreadPoolDomain *current)
 {
        ThreadPoolDomain *tpdomain = NULL;
-       guint len;
+       gint len;
 
-       len = threadpool->domains->len;
+       len = threadpool.domains->len;
        if (len > 0) {
-               guint i, current_idx = -1;
+               gint i, current_idx = -1;
                if (current) {
                        for (i = 0; i < len; ++i) {
-                               if (current == g_ptr_array_index (threadpool->domains, i)) {
+                               if (current == g_ptr_array_index (threadpool.domains, i)) {
                                        current_idx = i;
                                        break;
                                }
                        }
-                       g_assert (current_idx != (guint)-1);
                }
                for (i = current_idx + 1; i < len + current_idx + 1; ++i) {
-                       ThreadPoolDomain *tmp = (ThreadPoolDomain *)g_ptr_array_index (threadpool->domains, i % len);
+                       ThreadPoolDomain *tmp = (ThreadPoolDomain *)g_ptr_array_index (threadpool.domains, i % len);
                        if (tmp->outstanding_request > 0) {
                                tpdomain = tmp;
                                break;
@@ -365,9 +283,12 @@ worker_callback (gpointer unused)
        ThreadPoolCounter counter;
        MonoInternalThread *thread;
 
+       if (!mono_refcount_tryinc (&threadpool))
+               return;
+
        thread = mono_thread_internal_current ();
 
-       COUNTER_ATOMIC (threadpool, counter, {
+       COUNTER_ATOMIC (counter, {
                if (!(counter._.working < 32767 /* G_MAXINT16 */))
                        g_error ("%s: counter._.working = %d, but should be < 32767", __func__, counter._.working);
 
@@ -376,18 +297,14 @@ worker_callback (gpointer unused)
        });
 
        if (mono_runtime_is_shutting_down ()) {
-               COUNTER_ATOMIC (threadpool, counter, {
+               COUNTER_ATOMIC (counter, {
                        counter._.working --;
                });
 
-               mono_refcount_dec (threadpool);
+               mono_refcount_dec (&threadpool);
                return;
        }
 
-       mono_coop_mutex_lock (&threadpool->threads_lock);
-       g_ptr_array_add (threadpool->threads, thread);
-       mono_coop_mutex_unlock (&threadpool->threads_lock);
-
        /*
         * This is needed so there is always an lmf frame in the runtime invoke call below,
         * so ThreadAbortExceptions are caught even if the thread is in native code.
@@ -401,9 +318,12 @@ worker_callback (gpointer unused)
        while (!mono_runtime_is_shutting_down ()) {
                gboolean retire = FALSE;
 
-               if ((thread->state & (ThreadState_AbortRequested | ThreadState_SuspendRequested)) != 0) {
+               if (thread->state & (ThreadState_AbortRequested | ThreadState_SuspendRequested)) {
                        domains_unlock ();
-                       mono_thread_interruption_checkpoint ();
+                       if (mono_thread_interruption_checkpoint ()) {
+                               domains_lock ();
+                               continue;
+                       }
                        domains_lock ();
                }
 
@@ -471,19 +391,11 @@ worker_callback (gpointer unused)
 
        domains_unlock ();
 
-       mono_coop_mutex_lock (&threadpool->threads_lock);
-
-       g_ptr_array_remove_fast (threadpool->threads, thread);
-
-       mono_coop_cond_signal (&threadpool->threads_exit_cond);
-
-       mono_coop_mutex_unlock (&threadpool->threads_lock);
-
-       COUNTER_ATOMIC (threadpool, counter, {
+       COUNTER_ATOMIC (counter, {
                counter._.working --;
        });
 
-       mono_refcount_dec (threadpool);
+       mono_refcount_dec (&threadpool);
 }
 
 void
@@ -508,8 +420,6 @@ mono_threadpool_begin_invoke (MonoDomain *domain, MonoObject *target, MonoMethod
        if (!async_call_klass)
                async_call_klass = mono_class_load_from_name (mono_defaults.corlib, "System", "MonoAsyncCall");
 
-       mono_lazy_initialize (&status, initialize);
-
        mono_error_init (error);
 
        message = mono_method_call_message_new (method, params, mono_get_delegate_invoke (method->klass), (params != NULL) ? (&async_callback) : NULL, (params != NULL) ? (&state) : NULL, error);
@@ -626,14 +536,14 @@ mono_threadpool_remove_domain_jobs (MonoDomain *domain, int timeout)
        if (!mono_lazy_is_initialized (&status))
                return TRUE;
 
-       mono_refcount_inc (threadpool);
+       mono_refcount_inc (&threadpool);
 
        domains_lock ();
 
-       tpdomain = tpdomain_get (domain, FALSE);
+       tpdomain = tpdomain_get (domain);
        if (!tpdomain) {
                domains_unlock ();
-               mono_refcount_dec (threadpool);
+               mono_refcount_dec (&threadpool);
                return TRUE;
        }
 
@@ -641,7 +551,7 @@ mono_threadpool_remove_domain_jobs (MonoDomain *domain, int timeout)
 
        while (tpdomain->outstanding_request + tpdomain->threadpool_jobs > 0) {
                if (timeout == -1) {
-                       mono_coop_cond_wait (&tpdomain->cleanup_cond, &threadpool->domains_lock);
+                       mono_coop_cond_wait (&tpdomain->cleanup_cond, &threadpool.domains_lock);
                } else {
                        gint64 now;
                        gint res;
@@ -652,7 +562,7 @@ mono_threadpool_remove_domain_jobs (MonoDomain *domain, int timeout)
                                break;
                        }
 
-                       res = mono_coop_cond_timedwait (&tpdomain->cleanup_cond, &threadpool->domains_lock, end - now);
+                       res = mono_coop_cond_timedwait (&tpdomain->cleanup_cond, &threadpool.domains_lock, end - now);
                        if (res != 0) {
                                ret = FALSE;
                                break;
@@ -668,7 +578,7 @@ mono_threadpool_remove_domain_jobs (MonoDomain *domain, int timeout)
        mono_coop_cond_destroy (&tpdomain->cleanup_cond);
        tpdomain_free (tpdomain);
 
-       mono_refcount_dec (threadpool);
+       mono_refcount_dec (&threadpool);
 
        return ret;
 }
@@ -676,15 +586,15 @@ mono_threadpool_remove_domain_jobs (MonoDomain *domain, int timeout)
 void
 mono_threadpool_suspend (void)
 {
-       if (threadpool)
-               mono_threadpool_worker_set_suspended (threadpool->worker, TRUE);
+       if (mono_lazy_is_initialized (&status))
+               mono_threadpool_worker_set_suspended (TRUE);
 }
 
 void
 mono_threadpool_resume (void)
 {
-       if (threadpool)
-               mono_threadpool_worker_set_suspended (threadpool->worker, FALSE);
+       if (mono_lazy_is_initialized (&status))
+               mono_threadpool_worker_set_suspended (FALSE);
 }
 
 void
@@ -695,12 +605,18 @@ ves_icall_System_Threading_ThreadPool_GetAvailableThreadsNative (gint32 *worker_
        if (!worker_threads || !completion_port_threads)
                return;
 
-       mono_lazy_initialize (&status, initialize);
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool)) {
+               *worker_threads = 0;
+               *completion_port_threads = 0;
+               return;
+       }
 
-       counter = COUNTER_READ (threadpool);
+       counter = COUNTER_READ ();
 
-       *worker_threads = MAX (0, mono_threadpool_worker_get_max (threadpool->worker) - counter._.working);
-       *completion_port_threads = threadpool->limit_io_max;
+       *worker_threads = MAX (0, mono_threadpool_worker_get_max () - counter._.working);
+       *completion_port_threads = threadpool.limit_io_max;
+
+       mono_refcount_dec (&threadpool);
 }
 
 void
@@ -709,10 +625,16 @@ ves_icall_System_Threading_ThreadPool_GetMinThreadsNative (gint32 *worker_thread
        if (!worker_threads || !completion_port_threads)
                return;
 
-       mono_lazy_initialize (&status, initialize);
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool)) {
+               *worker_threads = 0;
+               *completion_port_threads = 0;
+               return;
+       }
+
+       *worker_threads = mono_threadpool_worker_get_min ();
+       *completion_port_threads = threadpool.limit_io_min;
 
-       *worker_threads = mono_threadpool_worker_get_min (threadpool->worker);
-       *completion_port_threads = threadpool->limit_io_min;
+       mono_refcount_dec (&threadpool);
 }
 
 void
@@ -721,25 +643,35 @@ ves_icall_System_Threading_ThreadPool_GetMaxThreadsNative (gint32 *worker_thread
        if (!worker_threads || !completion_port_threads)
                return;
 
-       mono_lazy_initialize (&status, initialize);
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool)) {
+               *worker_threads = 0;
+               *completion_port_threads = 0;
+               return;
+       }
+
+       *worker_threads = mono_threadpool_worker_get_max ();
+       *completion_port_threads = threadpool.limit_io_max;
 
-       *worker_threads = mono_threadpool_worker_get_max (threadpool->worker);
-       *completion_port_threads = threadpool->limit_io_max;
+       mono_refcount_dec (&threadpool);
 }
 
 MonoBoolean
 ves_icall_System_Threading_ThreadPool_SetMinThreadsNative (gint32 worker_threads, gint32 completion_port_threads)
 {
-       mono_lazy_initialize (&status, initialize);
+       if (completion_port_threads <= 0 || completion_port_threads > threadpool.limit_io_max)
+               return FALSE;
 
-       if (completion_port_threads <= 0 || completion_port_threads > threadpool->limit_io_max)
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool))
                return FALSE;
 
-       if (!mono_threadpool_worker_set_min (threadpool->worker, worker_threads))
+       if (!mono_threadpool_worker_set_min (worker_threads)) {
+               mono_refcount_dec (&threadpool);
                return FALSE;
+       }
 
-       threadpool->limit_io_min = completion_port_threads;
+       threadpool.limit_io_min = completion_port_threads;
 
+       mono_refcount_dec (&threadpool);
        return TRUE;
 }
 
@@ -748,16 +680,20 @@ ves_icall_System_Threading_ThreadPool_SetMaxThreadsNative (gint32 worker_threads
 {
        gint cpu_count = mono_cpu_count ();
 
-       mono_lazy_initialize (&status, initialize);
+       if (completion_port_threads < threadpool.limit_io_min || completion_port_threads < cpu_count)
+               return FALSE;
 
-       if (completion_port_threads < threadpool->limit_io_min || completion_port_threads < cpu_count)
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool))
                return FALSE;
 
-       if (!mono_threadpool_worker_set_max (threadpool->worker, worker_threads))
+       if (!mono_threadpool_worker_set_max (worker_threads)) {
+               mono_refcount_dec (&threadpool);
                return FALSE;
+       }
 
-       threadpool->limit_io_max = completion_port_threads;
+       threadpool.limit_io_max = completion_port_threads;
 
+       mono_refcount_dec (&threadpool);
        return TRUE;
 }
 
@@ -778,13 +714,13 @@ ves_icall_System_Threading_ThreadPool_NotifyWorkItemComplete (void)
        if (mono_domain_is_unloading (mono_domain_get ()) || mono_runtime_is_shutting_down ())
                return FALSE;
 
-       return mono_threadpool_worker_notify_completed (threadpool->worker);
+       return mono_threadpool_worker_notify_completed ();
 }
 
 void
 ves_icall_System_Threading_ThreadPool_NotifyWorkItemProgressNative (void)
 {
-       mono_threadpool_worker_notify_completed (threadpool->worker);
+       mono_threadpool_worker_notify_completed ();
 }
 
 void
@@ -807,21 +743,25 @@ ves_icall_System_Threading_ThreadPool_RequestWorkerThread (void)
        if (mono_domain_is_unloading (domain))
                return FALSE;
 
-       if (!mono_refcount_tryinc (threadpool)) {
+       if (!mono_lazy_initialize (&status, initialize) || !mono_refcount_tryinc (&threadpool)) {
                /* threadpool has been destroyed, we are shutting down */
                return FALSE;
        }
 
        domains_lock ();
 
-       /* synchronize with mono_threadpool_remove_domain_jobs */
-       if (mono_domain_is_unloading (domain)) {
-               domains_unlock ();
-               mono_refcount_dec (threadpool);
-               return FALSE;
+       tpdomain = tpdomain_get (domain);
+       if (!tpdomain) {
+               /* synchronize with mono_threadpool_remove_domain_jobs */
+               if (mono_domain_is_unloading (domain)) {
+                       domains_unlock ();
+                       mono_refcount_dec (&threadpool);
+                       return FALSE;
+               }
+
+               tpdomain = tpdomain_create (domain);
        }
 
-       tpdomain = tpdomain_get (domain, TRUE);
        g_assert (tpdomain);
 
        tpdomain->outstanding_request ++;
@@ -829,17 +769,18 @@ ves_icall_System_Threading_ThreadPool_RequestWorkerThread (void)
 
        domains_unlock ();
 
-       COUNTER_ATOMIC (threadpool, counter, {
+       COUNTER_ATOMIC (counter, {
                if (counter._.starting == 16) {
-                       mono_refcount_dec (threadpool);
+                       mono_refcount_dec (&threadpool);
                        return TRUE;
                }
 
                counter._.starting ++;
        });
 
-       mono_threadpool_worker_enqueue (threadpool->worker, worker_callback, NULL);
+       mono_threadpool_worker_enqueue (worker_callback, NULL);
 
+       mono_refcount_dec (&threadpool);
        return TRUE;
 }
 
index 968bd091061ba5df7eb0828566271b652e0154d4..f232f94f64820be086554c8a11f00ce0448ac7ce 100644 (file)
@@ -695,6 +695,7 @@ mono_thread_attach_internal (MonoThread *thread, gboolean force_attach, gboolean
 
        if (shutting_down && !force_attach) {
                mono_threads_unlock ();
+               mono_thread_pop_appdomain_ref ();
                return FALSE;
        }
 
@@ -3208,22 +3209,21 @@ remove_and_abort_threads (gpointer key, gpointer value, gpointer user)
        if (wait->num >= MONO_W32HANDLE_MAXIMUM_WAIT_OBJECTS)
                return FALSE;
 
-       /* The finalizer thread is not a background thread */
-       if (!mono_native_thread_id_equals (thread_get_tid (thread), self)
-            && (thread->state & ThreadState_Background) != 0
-            && (thread->flags & MONO_THREAD_FLAG_DONT_MANAGE) == 0
-       ) {
+       if (mono_native_thread_id_equals (thread_get_tid (thread), self))
+               return FALSE;
+       if (mono_gc_is_finalizer_internal_thread (thread))
+               return FALSE;
+
+       if ((thread->state & ThreadState_Background) && !(thread->flags & MONO_THREAD_FLAG_DONT_MANAGE)) {
                wait->handles[wait->num] = mono_threads_open_thread_handle (thread->handle);
                wait->threads[wait->num] = thread;
                wait->num++;
 
                THREAD_DEBUG (g_print ("%s: Aborting id: %"G_GSIZE_FORMAT"\n", __func__, (gsize)thread->tid));
                mono_thread_internal_abort (thread);
-               return TRUE;
        }
 
-       return !mono_native_thread_id_equals (thread_get_tid (thread), self)
-               && !mono_gc_is_finalizer_internal_thread (thread);
+       return TRUE;
 }
 
 /** 
index f826b7965e77f86719fd45b5d15f4545286801b0..e2cec88115b46804b96d1ec856b029954428da35 100644 (file)
@@ -5945,7 +5945,7 @@ mono_method_verify (MonoMethod *method, int level)
        for (i = 0; i < ctx.code_size && i < ip_offset; ++i) {
                if (ctx.code [i].flags & IL_CODE_FLAG_WAS_TARGET) {
                        if (!(ctx.code [i].flags & IL_CODE_FLAG_SEEN))
-                               ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Branch or exception block target middle of intruction at 0x%04x", i));
+                               ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Branch or exception block target middle of instruction at 0x%04x", i));
 
                        if (ctx.code [i].flags & IL_CODE_DELEGATE_SEQUENCE)
                                CODE_NOT_VERIFIABLE (&ctx, g_strdup_printf ("Branch to delegate code sequence at 0x%04x", i));
index 990ba3b3894cd9f9bb7245a60e6b7a30fcff29ed..b02f814fdbfcc5709a2be77b2f879d7cd92e861d 100644 (file)
@@ -52,6 +52,7 @@
 #define WSAENOTSOCK                10038
 #define WSAEDESTADDRREQ            10039
 #define WSAEMSGSIZE                10040
+#define WSAEPROTOTYPE              10041
 #define WSAENOPROTOOPT             10042
 #define WSAEPROTONOSUPPORT         10043
 #define WSAESOCKTNOSUPPORT         10044
index 2333d7e4a7f228a7ca1a852189c1059c59311530..9666cb67d9d0cbda59c938c69f4c77e864c375ea 100644 (file)
@@ -1099,7 +1099,7 @@ static void _wapi_set_last_path_error_from_errno (const gchar *dir,
  */
 static void file_close (gpointer handle, gpointer data)
 {
-       MONO_REQ_GC_SAFE_MODE; /* FIXME: after mono_w32handle_close is coop-aware, change this to UNSAFE_MODE and switch to SAFE around close() below */
+       /* FIXME: after mono_w32handle_close is coop-aware, change this to MONO_REQ_GC_UNSAFE_MODE and leave just the switch to SAFE around close() below */
        MONO_ENTER_GC_UNSAFE;
        MonoW32HandleFile *file_handle = (MonoW32HandleFile *)data;
        gint fd = file_handle->fd;
@@ -1839,7 +1839,7 @@ static gboolean file_setfiletime(gpointer handle,
 
 static void console_close (gpointer handle, gpointer data)
 {
-       MONO_REQ_GC_SAFE_MODE; /* FIXME: after mono_w32handle_close is coop-aware, change this to UNSAFE_MODE and switch to SAFE around close() below */
+       /* FIXME: after mono_w32handle_close is coop-aware, change this to MONO_REQ_GC_UNSAFE_MODE and leave just the switch to SAFE around close() below */
        MONO_ENTER_GC_UNSAFE;
        MonoW32HandleFile *console_handle = (MonoW32HandleFile *)data;
        gint fd = console_handle->fd;
@@ -1998,7 +1998,7 @@ static gsize find_typesize (void)
 
 static void pipe_close (gpointer handle, gpointer data)
 {
-       MONO_REQ_GC_SAFE_MODE; /* FIXME: after mono_w32handle_close is coop-aware, change this to UNSAFE_MODE and switch to SAFE around close() below */
+       /* FIXME: after mono_w32handle_close is coop-aware, change this to MONO_REQ_GC_UNSAFE_MODE and leave just the switch to SAFE around close() below */
        MONO_ENTER_GC_UNSAFE;
        MonoW32HandleFile *pipe_handle = (MonoW32HandleFile*)data;
        gint fd = pipe_handle->fd;
@@ -3651,7 +3651,9 @@ mono_w32file_find_close (gpointer handle)
 
        mono_w32handle_unlock_handle (handle);
        
+       MONO_ENTER_GC_SAFE;
        mono_w32handle_unref (handle);
+       MONO_EXIT_GC_SAFE;
        
        return(TRUE);
 }
@@ -4032,9 +4034,10 @@ mono_w32file_create_pipe (gpointer *readpipe, gpointer *writepipe, guint32 size)
                                            &pipe_write_handle);
        if (write_handle == INVALID_HANDLE_VALUE) {
                g_warning ("%s: error creating pipe write handle", __func__);
+
+               MONO_ENTER_GC_SAFE;
                mono_w32handle_unref (read_handle);
                
-               MONO_ENTER_GC_SAFE;
                close (filedes[0]);
                close (filedes[1]);
                MONO_EXIT_GC_SAFE;
index 4b463886f7b067b6e9df464932cdb0e6ff41d766..45d45a87452ed209cf6d46e6d6021657031e55b7 100644 (file)
@@ -98,18 +98,6 @@ static char *mono_environ[1] = { NULL };
 extern char **environ;
 #endif
 
-/*
- * Handles > _WAPI_PROCESS_UNHANDLED are pseudo handles which represent processes
- * not started by the runtime.
- */
-/* This marks a system process that we don't have a handle on */
-/* FIXME: Cope with PIDs > sizeof guint */
-#define _WAPI_PROCESS_UNHANDLED (1 << (8*sizeof(pid_t)-1))
-
-#define WAPI_IS_PSEUDO_PROCESS_HANDLE(handle) ((GPOINTER_TO_UINT(handle) & _WAPI_PROCESS_UNHANDLED) == _WAPI_PROCESS_UNHANDLED)
-#define WAPI_PID_TO_HANDLE(pid) GINT_TO_POINTER (_WAPI_PROCESS_UNHANDLED + (pid))
-#define WAPI_HANDLE_TO_PID(handle) (GPOINTER_TO_UINT ((handle)) - _WAPI_PROCESS_UNHANDLED)
-
 typedef enum {
        STARTF_USESHOWWINDOW=0x001,
        STARTF_USESIZE=0x002,
@@ -162,6 +150,7 @@ typedef struct _Process {
 /* MonoW32HandleProcess is a structure containing all the required information for process handling. */
 typedef struct {
        pid_t pid;
+       gboolean child;
        guint32 exitstatus;
        gpointer main_thread;
        guint64 create_time;
@@ -563,6 +552,33 @@ static const gunichar2 *utf16_space = utf16_space_bytes;
 static const gunichar2 utf16_quote_bytes [2] = { 0x22, 0 };
 static const gunichar2 *utf16_quote = utf16_quote_bytes;
 
+/* Check if a pid is valid - i.e. if a process exists with this pid. */
+static gboolean
+process_is_alive (pid_t pid)
+{
+#if defined(HOST_WATCHOS)
+       return TRUE; // TODO: Rewrite using sysctl
+#elif defined(PLATFORM_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__)
+       if (pid == 0)
+               return FALSE;
+       if (kill (pid, 0) == 0)
+               return TRUE;
+       if (errno == EPERM)
+               return TRUE;
+       return FALSE;
+#elif defined(__HAIKU__)
+       team_info teamInfo;
+       if (get_team_info ((team_id)pid, &teamInfo) == B_OK)
+               return TRUE;
+       return FALSE;
+#else
+       gchar *dir = g_strdup_printf ("/proc/%d", pid);
+       gboolean result = access (dir, F_OK) == 0;
+       g_free (dir);
+       return result;
+#endif
+}
+
 static void
 process_details (gpointer data)
 {
@@ -593,10 +609,6 @@ process_wait (gpointer handle, guint32 timeout, gboolean *alerted)
        Process *process;
        gboolean res;
 
-       /* FIXME: We can now easily wait on processes that aren't our own children,
-        * but WaitFor*Object won't call us for pseudo handles. */
-       g_assert (!WAPI_IS_PSEUDO_PROCESS_HANDLE (handle));
-
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u)", __func__, handle, timeout);
 
        if (alerted)
@@ -616,33 +628,23 @@ process_wait (gpointer handle, guint32 timeout, gboolean *alerted)
 
        pid = process_handle->pid;
 
-       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): PID: %d", __func__, handle, timeout, pid);
-
-       /* We don't need to lock processes here, the entry
-        * has a handle_count > 0 which means it will not be freed. */
-       process = process_handle->process;
-       if (!process) {
-               pid_t res;
-
-               if (pid == mono_process_current_pid ()) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): waiting on current process", __func__, handle, timeout);
-                       return MONO_W32HANDLE_WAIT_RET_TIMEOUT;
-               }
+       if (pid == mono_process_current_pid ()) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): waiting on current process", __func__, handle, timeout);
+               return MONO_W32HANDLE_WAIT_RET_TIMEOUT;
+       }
 
-               /* This path is used when calling Process.HasExited, so
-                * it is only used to poll the state of the process, not
-                * to actually wait on it to exit */
-               g_assert (timeout == 0);
+       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): PID: %d", __func__, handle, timeout, pid);
 
+       if (!process_handle->child) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): waiting on non-child process", __func__, handle, timeout);
 
-               res = waitpid (pid, &status, WNOHANG);
-               if (res == 0) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): non-child process wait timeout", __func__, handle, timeout);
-                       return MONO_W32HANDLE_WAIT_RET_TIMEOUT;
-               }
-               if (res > 0) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): non-child process waited successfully", __func__, handle, timeout);
+               if (!process_is_alive (pid)) {
+                       /* assume the process has exited */
+                       process_handle->exited = TRUE;
+                       process_handle->exitstatus = -1;
+                       mono_w32handle_set_signal_state (handle, TRUE, TRUE);
+
+                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s (%p, %u): non-child process is not alive anymore (2)", __func__, handle, timeout);
                        return MONO_W32HANDLE_WAIT_RET_SUCCESS_0;
                }
 
@@ -650,6 +652,11 @@ process_wait (gpointer handle, guint32 timeout, gboolean *alerted)
                return MONO_W32HANDLE_WAIT_RET_FAILED;
        }
 
+       /* We don't need to lock processes here, the entry
+        * has a handle_count > 0 which means it will not be freed. */
+       process = process_handle->process;
+       g_assert (process);
+
        start = mono_msec_ticks ();
        now = start;
 
@@ -865,31 +872,6 @@ mono_w32process_cleanup (void)
        g_free (cli_launcher);
 }
 
-/* Check if a pid is valid - i.e. if a process exists with this pid. */
-static gboolean
-is_pid_valid (pid_t pid)
-{
-       gboolean result = FALSE;
-
-#if defined(HOST_WATCHOS)
-       result = TRUE; // TODO: Rewrite using sysctl
-#elif defined(PLATFORM_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__)
-       if (((kill(pid, 0) == 0) || (errno == EPERM)) && pid != 0)
-               result = TRUE;
-#elif defined(__HAIKU__)
-       team_info teamInfo;
-       if (get_team_info ((team_id)pid, &teamInfo) == B_OK)
-               result = TRUE;
-#else
-       char *dir = g_strdup_printf ("/proc/%d", pid);
-       if (!access (dir, F_OK))
-               result = TRUE;
-       g_free (dir);
-#endif
-
-       return result;
-}
-
 static int
 len16 (const gunichar2 *str)
 {
@@ -940,11 +922,6 @@ mono_w32process_get_pid (gpointer handle)
        MonoW32HandleProcess *process_handle;
        gboolean res;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
-               /* This is a pseudo handle */
-               return WAPI_HANDLE_TO_PID (handle);
-       }
-
        res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
        if (!res) {
                mono_w32error_set_last (ERROR_INVALID_HANDLE);
@@ -971,8 +948,6 @@ get_process_foreach_callback (gpointer handle, gpointer handle_specific, gpointe
        if (mono_w32handle_get_type (handle) != MONO_W32HANDLE_PROCESS)
                return FALSE;
 
-       g_assert (!WAPI_IS_PSEUDO_PROCESS_HANDLE (handle));
-
        process_handle = (MonoW32HandleProcess*) handle_specific;
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: looking at process %d", __func__, process_handle->pid);
@@ -1011,9 +986,23 @@ ves_icall_System_Diagnostics_Process_GetProcess_internal (guint32 pid)
                return handle;
        }
 
-       if (is_pid_valid (pid)) {
-               /* Return a pseudo handle for processes we don't have handles for */
-               return WAPI_PID_TO_HANDLE (pid);
+       if (process_is_alive (pid)) {
+               /* non-child process */
+               MonoW32HandleProcess process_handle;
+
+               memset (&process_handle, 0, sizeof (process_handle));
+               process_handle.pid = pid;
+               process_handle.pname = mono_w32process_get_name (pid);
+
+               handle = mono_w32handle_new (MONO_W32HANDLE_PROCESS, &process_handle);
+               if (handle == INVALID_HANDLE_VALUE) {
+                       g_warning ("%s: error creating process handle", __func__);
+
+                       mono_w32error_set_last (ERROR_OUTOFMEMORY);
+                       return NULL;
+               }
+
+               return handle;
        }
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find pid %d", __func__, pid);
@@ -1091,20 +1080,15 @@ mono_w32process_try_get_modules (gpointer process, gpointer *modules, guint32 si
        if (size < sizeof(gpointer))
                return FALSE;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (process)) {
-               pid = WAPI_HANDLE_TO_PID (process);
-               pname = mono_w32process_get_name (pid);
-       } else {
-               res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
-                       return FALSE;
-               }
-
-               pid = process_handle->pid;
-               pname = g_strdup (process_handle->pname);
+       res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
+               return FALSE;
        }
 
+       pid = process_handle->pid;
+       pname = g_strdup (process_handle->pname);
+
        if (!pname) {
                modules[0] = NULL;
                *needed = sizeof(gpointer);
@@ -1220,21 +1204,15 @@ mono_w32process_module_get_name (gpointer process, gpointer module, gunichar2 *b
        if (basename == NULL || size == 0)
                return 0;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (process)) {
-               /* This is a pseudo handle */
-               pid = (pid_t)WAPI_HANDLE_TO_PID (process);
-               pname = mono_w32process_get_name (pid);
-       } else {
-               res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
-                       return 0;
-               }
-
-               pid = process_handle->pid;
-               pname = g_strdup (process_handle->pname);
+       res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
+               return 0;
        }
 
+       pid = process_handle->pid;
+       pname = g_strdup (process_handle->pname);
+
        mods = mono_w32process_get_modules (pid);
        if (!mods) {
                g_free (pname);
@@ -1320,20 +1298,15 @@ mono_w32process_module_get_information (gpointer process, gpointer module, MODUL
        if (modinfo == NULL || size < sizeof (MODULEINFO))
                return FALSE;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (process)) {
-               pid = (pid_t)WAPI_HANDLE_TO_PID (process);
-               pname = mono_w32process_get_name (pid);
-       } else {
-               res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
-                       return FALSE;
-               }
-
-               pid = process_handle->pid;
-               pname = g_strdup (process_handle->pname);
+       res = mono_w32handle_lookup (process, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, process);
+               return FALSE;
        }
 
+       pid = process_handle->pid;
+       pname = g_strdup (process_handle->pname);
+
        mods = mono_w32process_get_modules (pid);
        if (!mods) {
                g_free (pname);
@@ -2013,6 +1986,7 @@ process_create (const gunichar2 *appname, const gunichar2 *cmdline,
 
                memset (&process_handle, 0, sizeof (process_handle));
                process_handle.pid = pid;
+               process_handle.child = TRUE;
                process_handle.pname = g_strdup (prog);
                process_set_defaults (&process_handle);
 
@@ -2347,25 +2321,11 @@ MonoBoolean
 ves_icall_Microsoft_Win32_NativeMethods_GetExitCodeProcess (gpointer handle, gint32 *exitcode)
 {
        MonoW32HandleProcess *process_handle;
-       guint32 pid;
        gboolean res;
 
        if (!exitcode)
                return FALSE;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
-               pid = WAPI_HANDLE_TO_PID (handle);
-               /* This is a pseudo handle, so we don't know what the exit
-                * code was, but we can check whether it's alive or not */
-               if (is_pid_valid (pid)) {
-                       *exitcode = STILL_ACTIVE;
-                       return TRUE;
-               } else {
-                       *exitcode = -1;
-                       return TRUE;
-               }
-       }
-
        res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
        if (!res) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
@@ -2390,8 +2350,6 @@ ves_icall_Microsoft_Win32_NativeMethods_GetExitCodeProcess (gpointer handle, gin
 MonoBoolean
 ves_icall_Microsoft_Win32_NativeMethods_CloseProcess (gpointer handle)
 {
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle))
-               return TRUE;
        return mono_w32handle_close (handle);
 }
 
@@ -2402,23 +2360,17 @@ ves_icall_Microsoft_Win32_NativeMethods_TerminateProcess (gpointer handle, gint3
        MonoW32HandleProcess *process_handle;
        int ret;
        pid_t pid;
+       gboolean res;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
-               /* This is a pseudo handle */
-               pid = (pid_t)WAPI_HANDLE_TO_PID (handle);
-       } else {
-               gboolean res;
-
-               res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
-                       mono_w32error_set_last (ERROR_INVALID_HANDLE);
-                       return FALSE;
-               }
-
-               pid = process_handle->pid;
+       res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
+               mono_w32error_set_last (ERROR_INVALID_HANDLE);
+               return FALSE;
        }
 
+       pid = process_handle->pid;
+
        ret = kill (pid, exitcode == -1 ? SIGKILL : SIGTERM);
        if (ret == 0)
                return TRUE;
@@ -2445,15 +2397,15 @@ ves_icall_Microsoft_Win32_NativeMethods_GetProcessWorkingSetSize (gpointer handl
        if (!min || !max)
                return FALSE;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle))
-               return FALSE;
-
        res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
        if (!res) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
                return FALSE;
        }
 
+       if (!process_handle->child)
+               return FALSE;
+
        *min = process_handle->min_working_set;
        *max = process_handle->max_working_set;
        return TRUE;
@@ -2465,15 +2417,15 @@ ves_icall_Microsoft_Win32_NativeMethods_SetProcessWorkingSetSize (gpointer handl
        MonoW32HandleProcess *process_handle;
        gboolean res;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle))
-               return FALSE;
-
        res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
        if (!res) {
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
                return FALSE;
        }
 
+       if (!process_handle->child)
+               return FALSE;
+
        process_handle->min_working_set = min;
        process_handle->max_working_set = max;
        return TRUE;
@@ -2486,22 +2438,16 @@ ves_icall_Microsoft_Win32_NativeMethods_GetPriorityClass (gpointer handle)
        MonoW32HandleProcess *process_handle;
        gint ret;
        pid_t pid;
+       gboolean res;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
-               /* This is a pseudo handle */
-               pid = (pid_t)WAPI_HANDLE_TO_PID (handle);
-       } else {
-               gboolean res;
-
-               res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_w32error_set_last (ERROR_INVALID_HANDLE);
-                       return 0;
-               }
-
-               pid = process_handle->pid;
+       res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_w32error_set_last (ERROR_INVALID_HANDLE);
+               return 0;
        }
 
+       pid = process_handle->pid;
+
        errno = 0;
        ret = getpriority (PRIO_PROCESS, pid);
        if (ret == -1 && errno != 0) {
@@ -2547,22 +2493,16 @@ ves_icall_Microsoft_Win32_NativeMethods_SetPriorityClass (gpointer handle, gint3
        int ret;
        int prio;
        pid_t pid;
+       gboolean res;
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
-               /* This is a pseudo handle */
-               pid = (pid_t)WAPI_HANDLE_TO_PID (handle);
-       } else {
-               gboolean res;
-
-               res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-               if (!res) {
-                       mono_w32error_set_last (ERROR_INVALID_HANDLE);
-                       return FALSE;
-               }
-
-               pid = process_handle->pid;
+       res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_w32error_set_last (ERROR_INVALID_HANDLE);
+               return FALSE;
        }
 
+       pid = process_handle->pid;
+
        switch (priorityClass) {
        case MONO_W32PROCESS_PRIORITY_CLASS_IDLE:
                prio = 19;
@@ -2638,10 +2578,16 @@ ves_icall_Microsoft_Win32_NativeMethods_GetProcessTimes (gpointer handle, gint64
        memset (kernel_processtime, 0, sizeof (ProcessTime));
        memset (user_processtime, 0, sizeof (ProcessTime));
 
-       if (WAPI_IS_PSEUDO_PROCESS_HANDLE (handle)) {
+       res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
+       if (!res) {
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
+               return FALSE;
+       }
+
+       if (!process_handle->child) {
                gint64 start_ticks, user_ticks, kernel_ticks;
 
-               mono_process_get_times (GINT_TO_POINTER (WAPI_HANDLE_TO_PID (handle)),
+               mono_process_get_times (GINT_TO_POINTER (process_handle->pid),
                        &start_ticks, &user_ticks, &kernel_ticks);
 
                ticks_to_processtime (start_ticks, creation_processtime);
@@ -2650,12 +2596,6 @@ ves_icall_Microsoft_Win32_NativeMethods_GetProcessTimes (gpointer handle, gint64
                return TRUE;
        }
 
-       res = mono_w32handle_lookup (handle, MONO_W32HANDLE_PROCESS, (gpointer*) &process_handle);
-       if (!res) {
-               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_LAYER, "%s: Can't find process %p", __func__, handle);
-               return FALSE;
-       }
-
        ticks_to_processtime (process_handle->create_time, creation_processtime);
 
        /* A process handle is only signalled if the process has
index b4e3069d6400ea315c6073912a9b6e426e92d175..c10b210036825595d708b2b77a814abe1b855c84 100644 (file)
@@ -1318,6 +1318,9 @@ mono_w32socket_convert_error (gint error)
        case ENETDOWN: return WSAENETDOWN;
 #endif
        case ENODEV: return WSAENETDOWN;
+#ifdef EPROTOTYPE
+       case EPROTOTYPE: return WSAEPROTOTYPE;
+#endif
        default:
                g_error ("%s: no translation into winsock error for (%d) \"%s\"", __func__, error, g_strerror (error));
        }
index e39863e0dd11278239be184d80e208f6c9acb23e..0517bdd65f17a13d0834ae26aab8bbf22417c3cf 100644 (file)
@@ -2682,12 +2682,8 @@ ves_icall_System_Net_Sockets_Socket_SendFile_internal (gsize sock, MonoString *f
                return FALSE;
        }
 
-       MONO_ENTER_GC_SAFE;
-
        mono_w32file_close (file);
 
-       MONO_EXIT_GC_SAFE;
-
        if (*werror)
                return FALSE;
 
index 6052538a5934337bca8ec30fe0f1b5c4a6346cbd..37c19cabc3eeaa47a134a061d2ecd1f6e7d98522 100755 (executable)
@@ -391,6 +391,7 @@ if ENABLE_INTERPRETER
 interpreter_sources =  \
        interpreter/hacks.h             \
        interpreter/interp.h    \
+       interpreter/interp-internals.h  \
        interpreter/interp.c    \
        interpreter/mintops.h   \
        interpreter/mintops.def \
@@ -499,7 +500,7 @@ test_sources =                      \
 
 
 regtests_UNIVERSAL=basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe basic-vectors.exe
-iregtests=basic.exe basic-float.exe basic-long.exe basic-calls.exe generics-interp.exe
+iregtests=basic.exe basic-float.exe basic-long.exe basic-calls.exe generics.exe objects.exe
 
 if FULL_AOT_TESTS
 regtests= \
index 6e91638d881fe1f3f3f97a4cf2c9d97e12c9555b..6d4f50a42388fb4e9641557cf720f6c0756f0c50 100644 (file)
@@ -4330,7 +4330,9 @@ add_wrappers (MonoAotCompile *acfg)
                                        named += slen;
                                }
 
-                               wrapper = mono_marshal_get_managed_wrapper (method, klass, 0);
+                               wrapper = mono_marshal_get_managed_wrapper (method, klass, 0, &error);
+                               mono_error_assert_ok (&error);
+
                                add_method (acfg, wrapper);
                                if (export_name)
                                        g_hash_table_insert (acfg->export_names, wrapper, export_name);
index ed2b485a626d415b54fda77ef970106282fca802..85990d353ab31e4691c3aa969d833a488cab0d12 100644 (file)
@@ -1214,7 +1214,9 @@ decode_method_ref_with_target (MonoAotModule *module, MethodRef *ref, MonoMethod
                        klass = decode_klass_ref (module, p, &p, error);
                        if (!klass)
                                return FALSE;
-                       ref->method = mono_marshal_get_managed_wrapper (m, klass, 0);
+                       ref->method = mono_marshal_get_managed_wrapper (m, klass, 0, error);
+                       if (!mono_error_ok (error))
+                               return FALSE;
                        break;
                }
                default:
index d5bb4a397a6b2db96f45ff94bc7a1ca5e2a5a316..860e1ca626fd48ee19f6ff11b4f3dd65e8b461d2 100644 (file)
@@ -2066,7 +2066,7 @@ mono_main (int argc, char* argv[])
        case DO_REGRESSION:
 #ifdef ENABLE_INTERPRETER
                if (mono_use_interpreter) {
-                       if (interp_regression_list (2, argc -i, argv + i)) {
+                       if (mono_interp_regression_list (2, argc -i, argv + i)) {
                                g_print ("Regression ERRORS!\n");
                                // mini_cleanup (domain);
                                return 1;
@@ -2107,10 +2107,6 @@ mono_main (int argc, char* argv[])
                aname = argv [i];
                break;
        default:
-#ifdef ENABLE_INTERPRETER
-               if (mono_use_interpreter)
-                       g_error ("not yet");
-#endif
                if (argc - i < 1) {
                        mini_usage ();
                        mini_cleanup (domain);
diff --git a/mono/mini/generics-interp.cs b/mono/mini/generics-interp.cs
deleted file mode 100644 (file)
index ac06568..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-#if __MOBILE__
-class GenericsTests
-#else
-class Tests
-#endif
-{
-       struct TestStruct {
-               public int i;
-               public int j;
-
-               public TestStruct (int i, int j) {
-                       this.i = i;
-                       this.j = j;
-               }
-       }
-
-#if !__MOBILE__
-       public static int Main (string[] args) {
-               return TestDriver.RunTests (typeof (Tests), args);
-       }
-#endif
-
-       public static int test_1_no_nullable_unbox ()
-       {
-               return Unbox<int> (1);
-       }
-
-       public static int test_1_nullable_unbox_null ()
-       {
-               return Unbox<int?> (null).HasValue ? 0 : 1;
-       }
-
-       public static int test_1_nullable_box ()
-       {
-               return (int) Box<int?> (1);
-       }
-
-       public static int test_1_nullable_box_null ()
-       {
-               return Box<int?> (null) == null ? 1 : 0;
-       }
-
-       public static int test_1_isinst_nullable ()
-       {
-               object o = 1;
-               return (o is int?) ? 1 : 0;
-       }
-
-       public static int test_1_nullable_unbox_vtype ()
-       {
-               return Unbox<TestStruct?> (new TestStruct (1, 2)).Value.i;
-       }
-
-
-       public static int test_1_nullable_unbox_null_vtype ()
-       {
-               return Unbox<TestStruct?> (null).HasValue ? 0 : 1;
-       }
-
-       public static int test_1_nullable_box_vtype ()
-       {
-               return ((TestStruct)(Box<TestStruct?> (new TestStruct (1, 2)))).i;
-       }
-
-       public static int test_1_nullable_box_null_vtype ()
-       {
-               return Box<TestStruct?> (null) == null ? 1 : 0;
-       }
-
-       public static int test_1_isinst_nullable_vtype ()
-       {
-               object o = new TestStruct (1, 2);
-               return (o is TestStruct?) ? 1 : 0;
-       }
-
-       public static int test_0_nullable_normal_unbox ()
-       {
-               int? i = 5;
-
-               object o = i;
-               // This uses unbox instead of unbox_any
-               int? j = (int?)o;
-
-               if (j != 5)
-                       return 1;
-
-               return 0;
-       }
-
-       public static void stelem_any<T> (T[] arr, T elem) {
-               arr [0] = elem;
-       }
-
-       public static T ldelem_any<T> (T[] arr) {
-               return arr [0];
-       }
-
-       public static int test_1_ldelem_stelem_any_int () {
-               int[] arr = new int [3];
-               stelem_any (arr, 1);
-
-               return ldelem_any (arr);
-       }
-
-       public static T return_ref<T> (ref T t) {
-               return t;
-       }
-
-       public static T ldelema_any<T> (T[] arr) {
-               return return_ref<T> (ref arr [0]);
-       }
-
-       public static int test_0_ldelema () {
-               string[] arr = new string [1];
-
-               arr [0] = "Hello";
-
-               if (ldelema_any <string> (arr) == "Hello")
-                       return 0;
-               else
-                       return 1;
-       }
-
-       public static T[,] newarr_multi<T> () {
-               return new T [1, 1];
-       }
-
-       public static int test_0_newarr_multi_dim () {
-               return newarr_multi<string> ().GetType () == typeof (string[,]) ? 0 : 1;
-       }
-
-       static object Box<T> (T t)
-       {
-               return t;
-       }
-
-       static T Unbox <T> (object o) {
-               return (T) o;
-       }
-}
index 018619449191a8cf24899b7d1cba6f55519a85d0..9defe79f3cc9ff701d1c4bd16da6c91db5f49653 100644 (file)
@@ -233,6 +233,7 @@ class Tests
                return 0;
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_generic_get_value_optimization_vtype () {
                TestStruct[] arr = new TestStruct[] { new TestStruct (100, 200), new TestStruct (300, 400) };
                IEnumerator<TestStruct> enumerator = GenericClass<TestStruct>.Y (arr);
@@ -426,6 +427,7 @@ class Tests
        }
 #endif
 
+       [Category ("!INTERPRETER")]
        public static int test_0_ldvirtftn_generic_method () {
                new GenericsTests ().ldvirtftn<string> ();
 
@@ -452,6 +454,7 @@ class Tests
        // This cannot be made to work with full-aot, since there it is impossible to
        // statically determine that Foo<string>.Bar <int> is needed, the code only
        // references IFoo.Bar<int>
+       [Category ("!INTERPRETER")]
        [Category ("!FULLAOT")]
        public static int test_0_generic_virtual_on_interfaces () {
                Foo<string>.count1 = 0;
@@ -477,6 +480,7 @@ class Tests
                return 0;
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_generic_virtual_on_interfaces_ref () {
                Foo<string>.count1 = 0;
                Foo<string>.count2 = 0;
@@ -516,6 +520,7 @@ class Tests
                Value_2 = 2
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_regress_550964_constrained_enum_long () {
         MyEnumUlong a = MyEnumUlong.Value_2;
         MyEnumUlong b = MyEnumUlong.Value_2;
@@ -534,6 +539,7 @@ class Tests
                }
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_fullaot_linq () {
                var allWords = new XElement [] { new XElement { Value = "one" } };
                var filteredWords = allWords.Where(kw => kw.Value.StartsWith("T"));
@@ -556,6 +562,7 @@ class Tests
                int c = ((ICollection<T>)arr).Count;
        }
 
+       [Category ("!INTERPRETER")]
        /* Test that treating arrays as generic collections works with full-aot */
        public static int test_0_fullaot_array_wrappers () {
                GenericsTests[] arr = new GenericsTests [10];
@@ -615,6 +622,7 @@ class Tests
                return typeof (T);
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_gshared_delegate_rgctx () {
                Func<Type> t = new Func<Type> (get_type<string>);
 
@@ -624,6 +632,7 @@ class Tests
                        return 1;
        }
 
+       [Category ("!INTERPRETER")]
        // Creating a delegate from a generic method from gshared code
        public static int test_0_gshared_delegate_from_gshared () {
                if (gshared_delegate_from_gshared <object> () != 0)
@@ -655,6 +664,7 @@ class Tests
                public delegate TRet Transform<TRet> (TKey key, TValue value);
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_bug_620864 () {
                var d = new Pair<string, Type>.Transform<KeyValuePair<string, Type>> (Pair<string, Type>.make_pair);
 
@@ -711,6 +721,7 @@ class Tests
                return 0;
        }
 
+       [Category ("!INTERPRETER")]
        [Category ("GSHAREDVT")]
        public static int test_6_partial_sharing_linq () {
                var messages = new List<Message> ();
@@ -721,6 +732,7 @@ class Tests
                return messages.Max(i => i.MessageID);
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_partial_shared_method_in_nonshared_class () {
                var c = new Class1<double> ();
                return (c.Foo<string> (5).GetType () == typeof (Class1<string>)) ? 0 : 1;
@@ -897,6 +909,7 @@ class Tests
                }
        }
 
+       [Category ("!INTERPRETER")]
        [Category ("!FULLAOT")]
        [Category ("!BITCODE")]
        public static int test_0_regress_668095_synchronized_gshared () {
@@ -915,6 +928,7 @@ class Tests
                }
        }
 
+       [Category ("!INTERPRETER")]
        [Category ("GSHAREDVT")]
        static int test_0_synchronized_gshared () {
                var c = new SyncClass<string> ();
@@ -951,6 +965,7 @@ class Tests
        }
 
        // #2155
+       [Category ("!INTERPRETER")]
        [Category ("GSHAREDVT")]
        public static int test_0_fullaot_sflda_cctor () {
                List<Doc> documents = new List<Doc>();
@@ -976,6 +991,7 @@ class Tests
     static List<A> sources = new List<A>();
 
        // #6112
+       [Category ("!INTERPRETER")]
     public static int test_0_fullaot_imt () {
         sources.Add(null);
         sources.Add(null);
@@ -997,6 +1013,7 @@ class Tests
        class BClass : AClass {
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_fullaot_variant_iface () {
                var arr = new BClass [10];
                var enumerable = (IEnumerable<AClass>)arr;
@@ -1028,6 +1045,7 @@ class Tests
                }
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_1_regress_constrained_iface_call_7571 () {
         var r = new Record [10];
         Foo2<Record>.Extract (r);
@@ -1038,6 +1056,7 @@ class Tests
                Val = 1
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_regress_constrained_iface_call_enum () {
                var r = new ConstrainedEnum [10];
                return Foo3<ConstrainedEnum>.CompareTo (r);
@@ -1097,6 +1116,7 @@ class Tests
        }
 #endif
 
+       [Category ("!INTERPRETER")]
        public static int test_0_delegate_callvirt_fullaot () {
                Func<string> f = delegate () { return "A"; };
         var f2 = (Func<Func<string>, string>)Delegate.CreateDelegate (typeof
@@ -1179,6 +1199,7 @@ class Tests
                return t.GetHashCode ();
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_constrained_partial_sharing () {
                string s;
 
@@ -1235,6 +1256,7 @@ class Tests
 
        static object delegate_8_args_res;
 
+       [Category ("!INTERPRETER")]
        public static int test_0_delegate_8_args () {
                delegate_8_args_res = null;
                Action<string, string, string, string, string, string, string,
index 95e1fff2bb42a59abeb32870870b8c718163494f..0b123e50cf686664138ce21ffb0faa23c1e549c1 100644 (file)
@@ -155,121 +155,6 @@ mono_draw_cfg (MonoCompile *cfg, FILE *fp)
        fprintf (fp, "}\n");
 }
 
-#if 0
-
-static void
-mono_print_label (FILE *fp, MonoInst *tree) {
-       int arity;
-
-       if (!tree)
-               return;
-
-       arity = mono_burg_arity [tree->opcode];
-
-       fprintf (fp, "\\ %s%s", arity? "(": "",  mono_inst_name (tree->opcode));
-
-       switch (tree->opcode) {
-       case OP_ICONST:
-               fprintf (fp, "[%ld]", (long)tree->inst_c0);
-               break;
-       case OP_I8CONST:
-               fprintf (fp, "[%lld]", (long long)tree->inst_l);
-               break;
-       case OP_R8CONST:
-               fprintf (fp, "[%f]", *(double*)tree->inst_p0);
-               break;
-       case OP_R4CONST:
-               fprintf (fp, "[%f]", *(float*)tree->inst_p0);
-               break;
-       case OP_ARG:
-       case OP_LOCAL:
-               fprintf (fp, "[%d]", (int)tree->inst_c0);
-               break;
-       case OP_REGOFFSET:
-               fprintf (fp, "[0x%x(%s)]", (int)tree->inst_offset, mono_arch_regname (tree->inst_basereg));
-               break;
-       case OP_REGVAR:
-               fprintf (fp, "[%s]", mono_arch_regname (tree->dreg));
-               break;
-       case CEE_NEWARR:
-               fprintf (fp, "[%s]",  tree->inst_newa_class->name);
-               mono_print_label (fp, tree->inst_newa_len);
-               break;
-       case OP_CALL:
-       case OP_CALL_MEMBASE:
-       case OP_FCALL:
-       case OP_FCALL_MEMBASE:
-       case OP_LCALL:
-       case OP_LCALL_MEMBASE:
-       case OP_VCALL:
-       case OP_VCALL_MEMBASE:
-       case OP_VOIDCALL:
-       case OP_VOIDCALL_MEMBASE: {
-               MonoCallInst *call = (MonoCallInst*)tree;
-               if (call->method) {
-                       if (mono_method_signature (call->method)->hasthis && tree->inst_left) {
-                               mono_print_label (fp, tree->inst_left);
-                       }
-                       fprintf (fp, "[%s]", call->method->name);
-               }
-               break;
-       }
-       case OP_PHI: {
-               int i;
-               fprintf (fp, "[%d\\ (", (int)tree->inst_c0);
-               for (i = 0; i < tree->inst_phi_args [0]; i++) {
-                       if (i)
-                               fprintf (fp, ",\\ ");
-                       fprintf (fp, "%d", tree->inst_phi_args [i + 1]);
-               }
-               fprintf (fp, ")]");
-               break;
-       }
-       case OP_NOP:
-       case OP_JMP:
-       case OP_BREAK:
-               break;
-       case OP_BR:
-               fprintf (fp, "[B%d]", tree->inst_target_bb->block_num);
-               break;
-       case OP_SWITCH:
-       case CEE_ISINST:
-       case CEE_CASTCLASS:
-       case OP_CALL_REG:
-       case OP_FCALL_REG:
-       case OP_LCALL_REG:
-       case OP_VCALL_REG:
-       case OP_VOIDCALL_REG:
-               mono_print_label (fp, tree->inst_left);
-               break;
-       case CEE_BNE_UN:
-       case CEE_BEQ:
-       case CEE_BLT:
-       case CEE_BLT_UN:
-       case CEE_BGT:
-       case CEE_BGT_UN:
-       case CEE_BGE:
-       case CEE_BGE_UN:
-       case CEE_BLE:
-       case CEE_BLE_UN:
-               fprintf (fp, "[B%dB%d]", tree->inst_true_bb->block_num, tree->inst_false_bb->block_num);
-               mono_print_label (fp, tree->inst_left);
-               break;
-       default:
-               if (arity) {
-                       mono_print_label (fp, tree->inst_left);
-                       if (arity > 1)
-                               mono_print_label (fp, tree->inst_right);
-               }
-               break;
-       }
-
-       if (arity)
-               fprintf (fp, ")");
-}
-
-#endif
-
 static void
 mono_draw_code_cfg (MonoCompile *cfg, FILE *fp)
 {
index 65151b07024e8d1a2199d9b76119cd07be48c527..e4323480388d18ed54d50e046ddc014aedb50217 100644 (file)
@@ -1026,7 +1026,7 @@ public class Tests
                return t.ToString ();
        }
 
-       enum AnEnum {
+       public enum AnEnum {
                One,
                Two
        };
@@ -1106,10 +1106,12 @@ public class Tests
 
        interface IConstrainedCalls {
                Pair<int, int> vtype_ret<T, T2>(T t, T2 t2) where T: IReturnVType;
+               AnEnum enum_ret<T, T2>(T t, T2 t2) where T: IReturnVType;
        }
 
        public interface IReturnVType {
                Pair<int, int> return_vtype ();
+               AnEnum return_enum ();
        }
 
        public class CConstrainedCalls : IConstrainedCalls {
@@ -1117,12 +1119,20 @@ public class Tests
                public Pair<int, int> vtype_ret<T, T2>(T t, T2 t2) where T : IReturnVType {
                        return t.return_vtype ();
                }
+
+               [MethodImplAttribute (MethodImplOptions.NoInlining)]
+               public AnEnum enum_ret<T, T2>(T t, T2 t2) where T : IReturnVType {
+                       return t.return_enum ();
+               }
        }
 
        class ReturnVType : IReturnVType {
                public Pair<int, int> return_vtype () {
                        return new Pair<int, int> () { First = 1, Second = 2 };
                }
+               public AnEnum return_enum () {
+                       return AnEnum.Two;
+               }
        }
 
        public static int test_0_constrained_vtype_ret () {
@@ -1133,6 +1143,14 @@ public class Tests
                return 0;
        }
 
+       public static int test_0_constrained_enum_ret () {
+               IConstrainedCalls c = new CConstrainedCalls ();
+               var r = c.enum_ret<ReturnVType, int> (new ReturnVType (), 1);
+               if (r != AnEnum.Two)
+                       return 1;
+               return 0;
+       }
+
        public struct Pair<T1, T2> {
                public T1 First;
                public T2 Second;
diff --git a/mono/mini/interpreter/interp-internals.h b/mono/mini/interpreter/interp-internals.h
new file mode 100644 (file)
index 0000000..603e20a
--- /dev/null
@@ -0,0 +1,128 @@
+#ifndef __MONO_MINI_INTERPRETER_INTERNALS_H__
+#define __MONO_MINI_INTERPRETER_INTERNALS_H__
+
+#include <setjmp.h>
+#include <glib.h>
+#include <mono/metadata/loader.h>
+#include <mono/metadata/object.h>
+#include <mono/metadata/domain-internals.h>
+#include <mono/metadata/class-internals.h>
+#include "config.h"
+
+enum {
+       VAL_I32     = 0,
+       VAL_DOUBLE  = 1,
+       VAL_I64     = 2,
+       VAL_VALUET  = 3,
+       VAL_POINTER = 4,
+       VAL_NATI    = 0 + VAL_POINTER,
+       VAL_MP      = 1 + VAL_POINTER,
+       VAL_TP      = 2 + VAL_POINTER,
+       VAL_OBJ     = 3 + VAL_POINTER
+};
+
+#if SIZEOF_VOID_P == 4
+typedef guint32 mono_u;
+typedef gint32  mono_i;
+#elif SIZEOF_VOID_P == 8
+typedef guint64 mono_u;
+typedef gint64  mono_i;
+#endif
+
+/*
+ * Value types are represented on the eval stack as pointers to the
+ * actual storage. The size field tells how much storage is allocated.
+ * A value type can't be larger than 16 MB.
+ */
+typedef struct {
+       union {
+               gint32 i;
+               gint64 l;
+               double f;
+               /* native size integer and pointer types */
+               gpointer p;
+               mono_u nati;
+               gpointer vt;
+       } data;
+#if defined(__ppc__) || defined(__powerpc__)
+       int pad;
+#endif
+} stackval;
+
+typedef struct _MonoInvocation MonoInvocation;
+
+typedef void (*MonoFuncV) (void);
+typedef void (*MonoPIFunc) (MonoFuncV callme, void *margs);
+
+/* 
+ * Structure representing a method transformed for the interpreter 
+ * This is domain specific
+ */
+typedef struct _RuntimeMethod
+{
+       /* NOTE: These first two elements (method and
+          next_jit_code_hash) must be in the same order and at the
+          same offset as in MonoJitInfo, because of the jit_code_hash
+          internal hash table in MonoDomain. */
+       MonoMethod *method;
+       struct _RuntimeMethod *next_jit_code_hash;
+       guint32 locals_size;
+       guint32 args_size;
+       guint32 stack_size;
+       guint32 vt_stack_size;
+       guint32 alloca_size;
+       unsigned short *code;
+       unsigned short *new_body_start; /* after all STINARG instrs */
+       MonoPIFunc func;
+       int num_clauses;
+       MonoExceptionClause *clauses;
+       void **data_items;
+       int transformed;
+       guint32 *arg_offsets;
+       guint32 *local_offsets;
+       unsigned int param_count;
+       unsigned int hasthis;
+       unsigned int valuetype;
+} RuntimeMethod;
+
+struct _MonoInvocation {
+       MonoInvocation *parent; /* parent */
+       RuntimeMethod  *runtime_method; /* parent */
+       MonoMethod     *method; /* parent */
+       stackval       *retval; /* parent */
+       char           *args;
+       stackval       *stack_args; /* parent */
+       stackval       *stack;
+       stackval       *sp; /* For GC stack marking */
+       /* exception info */
+       unsigned char  invoke_trap;
+       const unsigned short  *ip;
+       MonoException     *ex;
+       MonoExceptionClause *ex_handler;
+};
+
+typedef struct {
+       MonoDomain *domain;
+       MonoInvocation *base_frame;
+       MonoInvocation *current_frame;
+       MonoInvocation *env_frame;
+       jmp_buf *current_env;
+       unsigned char search_for_handler;
+       unsigned char managed_code;
+} ThreadContext;
+
+extern int mono_interp_traceopt;
+
+MonoException *
+mono_interp_transform_method (RuntimeMethod *runtime_method, ThreadContext *context);
+
+MonoDelegate*
+mono_interp_ftnptr_to_delegate (MonoClass *klass, gpointer ftn);
+
+void
+mono_interp_transform_init (void);
+
+RuntimeMethod *
+mono_interp_get_runtime_method (MonoDomain *domain, MonoMethod *method, MonoError *error);
+
+#endif /* __MONO_MINI_INTERPRETER_INTERNALS_H__ */
index d3cfef356864d547e6952978de1c09dfefafb85a..355be888649cb14065a976f7cc42f185150261a6 100644 (file)
 #include <mono/metadata/mono-debug.h>
 
 #include "interp.h"
+#include "interp-internals.h"
 #include "mintops.h"
 #include "hacks.h"
 
 #include <mono/mini/mini.h>
+#include <mono/mini/jit-icalls.h>
 
 
 /* Mingw 2.1 doesnt need this any more, but leave it in for now for older versions */
@@ -105,7 +107,7 @@ static char* dump_args (MonoInvocation *inv);
 #if DEBUG_INTERP
 int mono_interp_traceopt = 2;
 /* If true, then we output the opcodes as we interpret them */
-static int global_tracing = 1;
+static int global_tracing = 2;
 
 static int debug_indent_level = 0;
 
@@ -304,6 +306,8 @@ get_virtual_method (MonoDomain *domain, RuntimeMethod *runtime_method, MonoObjec
                return ret;
        }
 
+       mono_class_setup_vtable (obj->vtable->klass);
+
        int slot = mono_method_get_vtable_slot (m);
        if (mono_class_is_interface (m->klass)) {
                g_assert (obj->vtable->klass != m->klass);
@@ -384,15 +388,11 @@ stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvo
                if (type->data.klass->enumtype) {
                        stackval_from_data (mono_class_enum_basetype (type->data.klass), result, data, pinvoke);
                        return;
-               } else {
-                       int size;
-                       
-                       if (pinvoke)
-                               size = mono_class_native_size (type->data.klass, NULL);
-                       else
-                               size = mono_class_value_size (type->data.klass, NULL);
-                       memcpy (result->data.vt, data, size);
-               }
+               } else
+                       mono_value_copy (result->data.vt, data, type->data.klass);
+               return;
+       case MONO_TYPE_GENERICINST:
+               stackval_from_data (&type->data.generic_class->container_class->byval_arg, result, data, pinvoke);
                return;
        default:
                g_warning ("got type 0x%02x", type->type);
@@ -479,16 +479,8 @@ stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke)
                if (type->data.klass->enumtype) {
                        stackval_to_data (mono_class_enum_basetype (type->data.klass), val, data, pinvoke);
                        return;
-               } else {
-                       int size;
-
-                       if (pinvoke)
-                               size = mono_class_native_size (type->data.klass, NULL);
-                       else
-                               size = mono_class_value_size (type->data.klass, NULL);
-
-                       memcpy (data, val->data.p, size);
-               }
+               } else
+                       mono_value_copy (data, val->data.vt, type->data.klass);
                return;
        case MONO_TYPE_GENERICINST:
                stackval_to_data (&type->data.generic_class->container_class->byval_arg, val, data, pinvoke);
@@ -756,6 +748,7 @@ static MethodArguments* build_args_from_sig (MonoMethodSignature *sig, MonoInvoc
                case MONO_TYPE_OBJECT:
                case MONO_TYPE_STRING:
                case MONO_TYPE_I8:
+               case MONO_TYPE_VALUETYPE:
                        margs->ilen++;
                        break;
                default:
@@ -766,8 +759,8 @@ static MethodArguments* build_args_from_sig (MonoMethodSignature *sig, MonoInvoc
        if (margs->ilen > 0)
                margs->iargs = g_malloc0 (sizeof (gpointer) * margs->ilen);
 
-       if (margs->ilen > 3)
-               g_error ("build_args_from_sig: TODO, more than two iregs: %d\n", margs->ilen);
+       if (margs->ilen > 6)
+               g_error ("build_args_from_sig: TODO, more than 6 iregs: %d\n", margs->ilen);
 
        if (margs->flen > 0)
                g_error ("build_args_from_sig: TODO, allocate floats: %d\n", margs->flen);
@@ -799,6 +792,7 @@ static MethodArguments* build_args_from_sig (MonoMethodSignature *sig, MonoInvoc
                case MONO_TYPE_OBJECT:
                case MONO_TYPE_STRING:
                case MONO_TYPE_I8:
+               case MONO_TYPE_VALUETYPE:
                        margs->iargs [int_i] = frame->stack_args [i].data.p;
 #if DEBUG_INTERP
                        g_print ("build_args_from_sig: margs->iargs[%d]: %p (frame @ %d)\n", int_i, margs->iargs[int_i], i);
@@ -1221,7 +1215,7 @@ get_trace_ips (MonoDomain *domain, MonoInvocation *top)
 #endif
 
 MonoObject*
-interp_mono_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error)
+mono_interp_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error)
 {
        MonoInvocation frame;
        ThreadContext * volatile context = mono_native_tls_get_value (thread_context_id);
@@ -1472,8 +1466,32 @@ static mono_mutex_t create_method_pointer_mutex;
 
 static GHashTable *method_pointer_hash = NULL;
 
+static MonoMethod *method_pointers [2] = {0};
+
+static MonoObject *
+mp_tramp_0 (MonoObject *this_obj, void **params, MonoObject **exc, void *compiled_method) {
+       MonoError error;
+       void *params_real[] = {this_obj, &params, &exc, &compiled_method};
+       MonoObject *ret = mono_interp_runtime_invoke (method_pointers [0], NULL, params_real, NULL, &error);
+       mono_error_cleanup (&error); /* FIXME: don't swallow the error */
+       return ret;
+}
+
+static MonoObject *
+mp_tramp_1 (MonoObject *this_obj, void **params, MonoObject **exc, void *compiled_method) {
+       MonoError error;
+       void *params_real[] = {this_obj, &params, &exc, &compiled_method};
+       MonoObject *ret = mono_interp_runtime_invoke (method_pointers [1], NULL, params_real, NULL, &error);
+       mono_error_cleanup (&error); /* FIXME: don't swallow the error */
+       return ret;
+}
+
+gpointer *mp_tramps[] = {(gpointer) mp_tramp_0, (gpointer) mp_tramp_1};
+
+static int tramps_used = 0;
+
 gpointer
-interp_create_method_pointer (MonoMethod *method, MonoError *error)
+mono_interp_create_method_pointer (MonoMethod *method, MonoError *error)
 {
        gpointer addr;
        MonoJitInfo *ji;
@@ -1503,10 +1521,13 @@ interp_create_method_pointer (MonoMethod *method, MonoError *error)
                mono_jit_info_table_add (mono_get_root_domain (), ji);
        }               
        else {
-               g_error ("FIXME: not available? figure out new API");
-#if 0
-               addr = mono_arch_create_method_pointer (method);
-#endif
+               g_assert (method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE);
+               g_assert (tramps_used < 2);
+
+               /* FIXME: needs locking */
+               method_pointers [tramps_used] = method;
+               addr = mp_tramps [tramps_used];
+               tramps_used++;
        }
 
        g_hash_table_insert (method_pointer_hash, method, addr);
@@ -1800,7 +1821,9 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                        if (csignature->hasthis)
                                --sp;
                        child_frame.stack_args = sp;
-                       if (csignature->hasthis && mono_object_is_transparent_proxy (sp->data.p)) {
+
+                       /* `this' can be NULL for string:.ctor */
+                       if (csignature->hasthis && sp->data.p && mono_object_is_transparent_proxy (sp->data.p)) {
                                child_frame.runtime_method = mono_interp_get_runtime_method (context->domain, mono_marshal_get_remoting_invoke (child_frame.runtime_method->method), &error);
                                mono_error_cleanup (&error); /* FIXME: don't swallow the error */
                        } else if (child_frame.runtime_method->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
@@ -1885,7 +1908,9 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                        if (child_frame.runtime_method->hasthis)
                                --sp;
                        child_frame.stack_args = sp;
-                       if (child_frame.runtime_method->hasthis && !child_frame.runtime_method->valuetype && mono_object_is_transparent_proxy (sp->data.p)) {
+
+                       /* `this' can be NULL for string:.ctor */
+                       if (child_frame.runtime_method->hasthis && !child_frame.runtime_method->valuetype && sp->data.p && mono_object_is_transparent_proxy (sp->data.p)) {
                                child_frame.runtime_method = mono_interp_get_runtime_method (context->domain, mono_marshal_get_remoting_invoke (child_frame.runtime_method->method), &error);
                                mono_error_cleanup (&error); /* FIXME: don't swallow the error */
                        }
@@ -1960,7 +1985,9 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                        child_frame.runtime_method = get_virtual_method (context->domain, child_frame.runtime_method, this_arg);
 
                        if (this_arg->vtable->klass->valuetype && child_frame.runtime_method->valuetype) {
-                               sp->data.p = (char *) this_arg + sizeof (MonoObject);
+                               /* unbox */
+                               gpointer *unboxed = mono_object_unbox (this_arg);
+                               stackval_from_data (&this_arg->vtable->klass->byval_arg, sp, (char *) unboxed, FALSE);
                        }
 
                        ves_exec_method_with_context (&child_frame, context);
@@ -2005,7 +2032,8 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                        child_frame.runtime_method = get_virtual_method (context->domain, child_frame.runtime_method, this_arg);
 
                        if (this_arg->vtable->klass->valuetype && child_frame.runtime_method->valuetype) {
-                               sp->data.p = (char *) this_arg + sizeof (MonoObject);
+                               gpointer *unboxed = mono_object_unbox (this_arg);
+                               stackval_from_data (&this_arg->vtable->klass->byval_arg, sp, (char *) unboxed, FALSE);
                        }
 
                        ves_exec_method_with_context (&child_frame, context);
@@ -2362,10 +2390,12 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                        ++ip;
                        sp[-1].data.l = *(gint64*)sp[-1].data.p;
                        MINT_IN_BREAK;
-               MINT_IN_CASE(MINT_LDIND_I)
-                       ++ip;
-                       sp[-1].data.p = *(gpointer*)sp[-1].data.p;
+               MINT_IN_CASE(MINT_LDIND_I) {
+                       guint16 offset = * (guint16 *)(ip + 1);
+                       sp[-1 - offset].data.p = *(gpointer*)sp[-1 - offset].data.p;
+                       ip += 2;
                        MINT_IN_BREAK;
+               }
                MINT_IN_CASE(MINT_LDIND_R4)
                        ++ip;
                        sp[-1].data.f = *(gfloat*)sp[-1].data.p;
@@ -2779,6 +2809,7 @@ ves_exec_method_with_context (MonoInvocation *frame, ThreadContext *context)
                                                mono_thread_interruption_checkpoint ();
                                        sp->data.p = o;
                                } else {
+                                       sp->data.p = NULL;
                                        child_frame.retval = &retval;
                                }
                        }
@@ -3033,94 +3064,24 @@ array_constructed:
                }
                MINT_IN_CASE(MINT_LDSFLDA) {
                        MonoClassField *field = rtm->data_items[*(guint16 *)(ip + 1)];
-                       MonoVTable *vt = mono_class_vtable (context->domain, field->parent);
-                       gpointer addr;
-
-                       if (!vt->initialized) {
-                               frame->ip = ip;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
+                       sp->data.p = mono_class_static_field_address (context->domain, field);
                        ip += 2;
-
-                       if (context->domain->special_static_fields && (addr = g_hash_table_lookup (context->domain->special_static_fields, field)))
-                               sp->data.p = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
-                       else
-                               sp->data.p = (char*)(vt->vtable) + field->offset;
                        ++sp;
                        MINT_IN_BREAK;
                }
                MINT_IN_CASE(MINT_LDSFLD) {
-                       MonoVTable *vt;
-                       MonoClassField *field;
-                       gpointer addr;
-
-                       field = rtm->data_items[*(guint16 *)(ip + 1)];
-                       vt = rtm->data_items [*(guint16 *)(ip + 2)];
-                       if (!vt->initialized) {
-                               frame->ip = ip;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       ip += 3;
-                       if (context->domain->special_static_fields && (addr = g_hash_table_lookup (context->domain->special_static_fields, field)))
-                               addr = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
-                       else
-                               addr = (char*)(vt->vtable) + field->offset;
-
+                       MonoClassField *field = rtm->data_items [* (guint16 *)(ip + 1)];
+                       gpointer addr = mono_class_static_field_address (context->domain, field);
                        stackval_from_data (field->type, sp, addr, FALSE);
-                       ++sp;
-                       MINT_IN_BREAK;
-               }
-               MINT_IN_CASE(MINT_LDSFLD_I4) {
-                       MonoClassField *field = rtm->data_items[*(guint16 *)(ip + 1)];
-                       MonoVTable *vt = rtm->data_items [*(guint16 *)(ip + 2)];
-                       if (!vt->initialized) {
-                               frame->ip = ip;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       ip += 3;
-                       sp->data.i = * (gint32 *)((char*)(vt->vtable) + field->offset);
-                       ++sp;
-                       MINT_IN_BREAK;
-               }
-               MINT_IN_CASE(MINT_LDSFLD_O) {
-                       MonoClassField *field = rtm->data_items[*(guint16 *)(ip + 1)];
-                       MonoVTable *vt = rtm->data_items [*(guint16 *)(ip + 2)];
-                       if (!vt->initialized) {
-                               frame->ip = ip;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       ip += 3;
-                       sp->data.p = * (gpointer *)((char*)(vt->vtable) + field->offset);
+                       ip += 2;
                        ++sp;
                        MINT_IN_BREAK;
                }
                MINT_IN_CASE(MINT_LDSFLD_VT) {
-                       MonoVTable *vt;
-                       MonoClassField *field;
-                       guint32 token;
-                       gpointer addr;
-                       int size;
-
-                       token = * (guint16 *)(ip + 1);
-                       size = READ32(ip + 2);
-                       field = rtm->data_items[token];
+                       MonoClassField *field = rtm->data_items [* (guint16 *)(ip + 1)];
+                       gpointer addr = mono_class_static_field_address (context->domain, field);
+                       int size = READ32 (ip + 2);
                        ip += 4;
-                                               
-                       vt = mono_class_vtable (context->domain, field->parent);
-                       if (!vt->initialized) {
-                               frame->ip = ip - 2;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       
-                       if (context->domain->special_static_fields && (addr = g_hash_table_lookup (context->domain->special_static_fields, field)))
-                               addr = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
-                       else
-                               addr = (char*)(vt->vtable) + field->offset;
 
                        sp->data.p = vt_sp;
                        vt_sp += (size + 7) & ~7;
@@ -3129,54 +3090,19 @@ array_constructed:
                        MINT_IN_BREAK;
                }
                MINT_IN_CASE(MINT_STSFLD) {
-                       MonoVTable *vt;
-                       MonoClassField *field;
-                       guint32 token;
-                       gpointer addr;
-
-                       token = * (guint16 *)(ip + 1);
-                       field = rtm->data_items[token];
+                       MonoClassField *field = rtm->data_items [* (guint16 *)(ip + 1)];
+                       gpointer addr = mono_class_static_field_address (context->domain, field);
                        ip += 2;
                        --sp;
-
-                       vt = mono_class_vtable (context->domain, field->parent);
-                       if (!vt->initialized) {
-                               frame->ip = ip - 2;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       
-                       if (context->domain->special_static_fields && (addr = g_hash_table_lookup (context->domain->special_static_fields, field)))
-                               addr = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
-                       else
-                               addr = (char*)(vt->vtable) + field->offset;
-
                        stackval_to_data (field->type, sp, addr, FALSE);
                        MINT_IN_BREAK;
                }
                MINT_IN_CASE(MINT_STSFLD_VT) {
-                       MonoVTable *vt;
-                       MonoClassField *field;
-                       guint32 token;
-                       gpointer addr;
-                       int size;
-
-                       token = * (guint16 *)(ip + 1);
-                       size = READ32(ip + 2);
-                       field = rtm->data_items[token];
+                       MonoClassField *field = rtm->data_items [* (guint16 *)(ip + 1)];
+                       gpointer addr = mono_class_static_field_address (context->domain, field);
+                       int size = READ32 (ip + 2);
                        ip += 4;
-                                               
-                       vt = mono_class_vtable (context->domain, field->parent);
-                       if (!vt->initialized) {
-                               frame->ip = ip - 2;
-                               mono_runtime_class_init_full (vt, &error);
-                               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       }
-                       
-                       if (context->domain->special_static_fields && (addr = g_hash_table_lookup (context->domain->special_static_fields, field)))
-                               addr = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
-                       else
-                               addr = (char*)(vt->vtable) + field->offset;
+
                        --sp;
                        stackval_to_data (field->type, sp, addr, FALSE);
                        vt_sp -= (size + 7) & ~7;
@@ -3232,23 +3158,24 @@ array_constructed:
                        sp [-1].data.i = (mono_u)sp [-1].data.l;
                        ++ip;
                        MINT_IN_BREAK;
-               MINT_IN_CASE(MINT_BOX)
+               MINT_IN_CASE(MINT_BOX) {
                        c = rtm->data_items [* (guint16 *)(ip + 1)];
+                       guint16 offset = * (guint16 *)(ip + 2);
 
                        if (c->byval_arg.type == MONO_TYPE_VALUETYPE && !c->enumtype) {
                                int size = mono_class_value_size (c, NULL);
-                               sp [-1].data.p = mono_value_box_checked (context->domain, c, sp [-1].data.p, &error);
+                               sp [-1 - offset].data.p = mono_value_box_checked (context->domain, c, sp [-1 - offset].data.p, &error);
                                mono_error_cleanup (&error); /* FIXME: don't swallow the error */
                                size = (size + 7) & ~7;
                                vt_sp -= size;
-                       }                               
-                       else {
-                               stackval_to_data (&c->byval_arg, &sp [-1], (char*)&sp [-1], FALSE);
-                               sp [-1].data.p = mono_value_box_checked (context->domain, c, &sp [-1], &error);
+                       } else {
+                               stackval_to_data (&c->byval_arg, &sp [-1 - offset], (char *) &sp [-1 - offset], FALSE);
+                               sp [-1 - offset].data.p = mono_value_box_checked (context->domain, c, &sp [-1 - offset], &error);
                                mono_error_cleanup (&error); /* FIXME: don't swallow the error */
                        }
-                       ip += 2;
+                       ip += 3;
                        MINT_IN_BREAK;
+               }
                MINT_IN_CASE(MINT_NEWARR)
                        sp [-1].data.p = (MonoObject*) mono_array_new_checked (context->domain, rtm->data_items[*(guint16 *)(ip + 1)], sp [-1].data.i, &error);
                        mono_error_cleanup (&error); /* FIXME: don't swallow the error */
@@ -3322,7 +3249,8 @@ array_constructed:
                MINT_IN_CASE(MINT_LDELEM_I)  /* fall through */
                MINT_IN_CASE(MINT_LDELEM_R4) /* fall through */
                MINT_IN_CASE(MINT_LDELEM_R8) /* fall through */
-               MINT_IN_CASE(MINT_LDELEM_REF) {
+               MINT_IN_CASE(MINT_LDELEM_REF) /* fall through */
+               MINT_IN_CASE(MINT_LDELEM_VT) {
                        MonoArray *o;
                        mono_u aindex;
 
@@ -3373,6 +3301,16 @@ array_constructed:
                        case MINT_LDELEM_REF:
                                sp [0].data.p = mono_array_get (o, gpointer, aindex);
                                break;
+                       case MINT_LDELEM_VT: {
+                               MonoClass *klass_vt = rtm->data_items [*(guint16 *) (ip + 1)];
+                               i32 = READ32 (ip + 2);
+                               char *src_addr = mono_array_addr_with_size ((MonoArray *) o, i32, aindex);
+                               sp [0].data.vt = vt_sp;
+                               stackval_from_data (&klass_vt->byval_arg, sp, src_addr, FALSE);
+                               vt_sp += (i32 + 7) & ~7;
+                               ip += 3;
+                               break;
+                       }
                        default:
                                ves_abort();
                        }
@@ -3388,7 +3326,8 @@ array_constructed:
                MINT_IN_CASE(MINT_STELEM_I8) /* fall through */
                MINT_IN_CASE(MINT_STELEM_R4) /* fall through */
                MINT_IN_CASE(MINT_STELEM_R8) /* fall through */
-               MINT_IN_CASE(MINT_STELEM_REF) {
+               MINT_IN_CASE(MINT_STELEM_REF) /* fall through */
+               MINT_IN_CASE(MINT_STELEM_VT) {
                        mono_u aindex;
 
                        sp -= 3;
@@ -3429,7 +3368,18 @@ array_constructed:
                                if (sp [2].data.p && !isinst_obj)
                                        THROW_EX (mono_get_exception_array_type_mismatch (), ip);
                                mono_array_set ((MonoArray *)o, gpointer, aindex, sp [2].data.p);
-                       } break;
+                               break;
+                       }
+                       case MINT_STELEM_VT: {
+                               MonoClass *klass_vt = rtm->data_items [*(guint16 *) (ip + 1)];
+                               i32 = READ32 (ip + 2);
+                               char *dst_addr = mono_array_addr_with_size ((MonoArray *) o, i32, aindex);
+
+                               stackval_to_data (&klass_vt->byval_arg, &sp [2], dst_addr, FALSE);
+                               vt_sp -= (i32 + 7) & ~7;
+                               ip += 3;
+                               break;
+                       }
                        default:
                                ves_abort();
                        }
@@ -4435,6 +4385,7 @@ interp_regression_step (MonoImage *image, int verbose, int *total_run, int *tota
 
        g_timer_start (timer);
        for (i = 0; i < mono_image_get_table_rows (image, MONO_TABLE_METHOD); ++i) {
+               MonoObject *exc = NULL;
                MonoError error;
                MonoMethod *method = mono_get_method_checked (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL, NULL, &error);
                if (!method) {
@@ -4457,14 +4408,43 @@ interp_regression_step (MonoImage *image, int verbose, int *total_run, int *tota
                        } else {
                                filter = strcmp (method->name, name) == 0;
                        }
-               } else { // no filter
+               } else { /* no filter, check for `Category' attribute on method */
                        filter = TRUE;
+                       MonoCustomAttrInfo* ainfo = mono_custom_attrs_from_method_checked (method, &error);
+                       mono_error_cleanup (&error);
+
+                       if (ainfo) {
+                               int j;
+                               for (j = 0; j < ainfo->num_attrs && filter; ++j) {
+                                       MonoCustomAttrEntry *centry = &ainfo->attrs [j];
+                                       if (centry->ctor == NULL)
+                                               continue;
+
+                                       MonoClass *klass = centry->ctor->klass;
+                                       if (strcmp (klass->name, "CategoryAttribute"))
+                                               continue;
+
+                                       MonoObject *obj = mono_custom_attrs_get_attr_checked (ainfo, klass, &error);
+                                       /* FIXME: there is an ordering problem if there're multiple attributes, do this instead:
+                                        * MonoObject *obj = create_custom_attr (ainfo->image, centry->ctor, centry->data, centry->data_size, &error); */
+                                       mono_error_cleanup (&error);
+                                       MonoMethod *getter = mono_class_get_method_from_name (klass, "get_Category", -1);
+                                       MonoObject *str = mono_interp_runtime_invoke (getter, obj, NULL, &exc, &error);
+                                       mono_error_cleanup (&error);
+                                       char *utf8_str = mono_string_to_utf8_checked ((MonoString *) str, &error);
+                                       mono_error_cleanup (&error);
+                                       if (!strcmp (utf8_str, "!INTERPRETER")) {
+                                               g_print ("skip %s...\n", method->name);
+                                               filter = FALSE;
+                                       }
+                               }
+                       }
                }
                if (strncmp (method->name, "test_", 5) == 0 && filter) {
                        MonoError interp_error;
                        MonoObject *exc = NULL;
 
-                       result_obj = interp_mono_runtime_invoke (method, NULL, NULL, &exc, &interp_error);
+                       result_obj = mono_interp_runtime_invoke (method, NULL, NULL, &exc, &interp_error);
                        if (!mono_error_ok (&interp_error)) {
                                cfailed++;
                                g_print ("Test '%s' execution failed.\n", method->name);
@@ -4528,7 +4508,7 @@ interp_regression (MonoImage *image, int verbose, int *total_run)
 }
 
 int
-interp_regression_list (int verbose, int count, char *images [])
+mono_interp_regression_list (int verbose, int count, char *images [])
 {
        int i, total, total_run, run;
        
index e818af53e01c8670bf70371f33f7a3e413b0bf70..8c75b945b3fed0f1ad9a8acd974685d44a1d9186 100644 (file)
-#include <setjmp.h>
-#include <glib.h>
-#include <mono/metadata/loader.h>
-#include <mono/metadata/object.h>
-#include <mono/metadata/domain-internals.h>
-#include <mono/metadata/class-internals.h>
-#include "config.h"
-
-enum {
-       VAL_I32     = 0,
-       VAL_DOUBLE  = 1,
-       VAL_I64     = 2,
-       VAL_VALUET  = 3,
-       VAL_POINTER = 4,
-       VAL_NATI    = 0 + VAL_POINTER,
-       VAL_MP      = 1 + VAL_POINTER,
-       VAL_TP      = 2 + VAL_POINTER,
-       VAL_OBJ     = 3 + VAL_POINTER
-};
-
-#if SIZEOF_VOID_P == 4
-typedef guint32 mono_u;
-typedef gint32  mono_i;
-#elif SIZEOF_VOID_P == 8
-typedef guint64 mono_u;
-typedef gint64  mono_i;
-#endif
-
-/*
- * Value types are represented on the eval stack as pointers to the
- * actual storage. The size field tells how much storage is allocated.
- * A value type can't be larger than 16 MB.
- */
-typedef struct {
-       union {
-               gint32 i;
-               gint64 l;
-               double f;
-               /* native size integer and pointer types */
-               gpointer p;
-               mono_u nati;
-               gpointer vt;
-       } data;
-#if defined(__ppc__) || defined(__powerpc__)
-       int pad;
-#endif
-} stackval;
-
-typedef struct _MonoInvocation MonoInvocation;
-
-typedef void (*MonoFuncV) (void);
-typedef void (*MonoPIFunc) (MonoFuncV callme, void *margs);
-
-/* 
- * Structure representing a method transformed for the interpreter 
- * This is domain specific
- */
-typedef struct _RuntimeMethod
-{
-       /* NOTE: These first two elements (method and
-          next_jit_code_hash) must be in the same order and at the
-          same offset as in MonoJitInfo, because of the jit_code_hash
-          internal hash table in MonoDomain. */
-       MonoMethod *method;
-       struct _RuntimeMethod *next_jit_code_hash;
-       guint32 locals_size;
-       guint32 args_size;
-       guint32 stack_size;
-       guint32 vt_stack_size;
-       guint32 alloca_size;
-       unsigned short *code;
-       unsigned short *new_body_start; /* after all STINARG instrs */
-       MonoPIFunc func;
-       int num_clauses;
-       MonoExceptionClause *clauses;
-       void **data_items;
-       int transformed;
-       guint32 *arg_offsets;
-       guint32 *local_offsets;
-       unsigned int param_count;
-       unsigned int hasthis;
-       unsigned int valuetype;
-} RuntimeMethod;
-
-struct _MonoInvocation {
-       MonoInvocation *parent; /* parent */
-       RuntimeMethod  *runtime_method; /* parent */
-       MonoMethod     *method; /* parent */
-       stackval       *retval; /* parent */
-       char           *args;
-       stackval       *stack_args; /* parent */
-       stackval       *stack;
-       stackval       *sp; /* For GC stack marking */
-       /* exception info */
-       unsigned char  invoke_trap;
-       const unsigned short  *ip;
-       MonoException     *ex;
-       MonoExceptionClause *ex_handler;
-};
-
-typedef struct {
-       MonoDomain *domain;
-       MonoInvocation *base_frame;
-       MonoInvocation *current_frame;
-       MonoInvocation *env_frame;
-       jmp_buf *current_env;
-       unsigned char search_for_handler;
-       unsigned char managed_code;
-} ThreadContext;
-
-void mono_init_icall (void);
-
-MonoException *
-mono_interp_transform_method (RuntimeMethod *runtime_method, ThreadContext *context);
-
-MonoDelegate*
-mono_interp_ftnptr_to_delegate (MonoClass *klass, gpointer ftn);
+#ifndef __MONO_MINI_INTERPRETER_H__
+#define __MONO_MINI_INTERPRETER_H__
+#include <mono/mini/mini.h>
 
 int
-interp_regression_list (int verbose, int count, char *images []);
+mono_interp_regression_list (int verbose, int count, char *images []);
 
 void
-mono_interp_transform_init (void);
-
-static void inline stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvoke);
-static void inline stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke);
-void ves_exec_method (MonoInvocation *frame);
-
-/*
- * defined in an arch specific file.
- */
-MonoPIFunc
-mono_arch_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor);
+mono_interp_init (void);
 
-RuntimeMethod *
-mono_interp_get_runtime_method (MonoDomain *domain, MonoMethod *method, MonoError *error);
+gpointer
+mono_interp_create_method_pointer (MonoMethod *method, MonoError *error);
 
-void *mono_arch_create_method_pointer (MonoMethod *method);
+MonoObject*
+mono_interp_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error);
 
-extern int mono_interp_traceopt;
+#endif /* __MONO_MINI_INTERPRETER_H__ */
index 7ce21566f40e8dc1b3fdcf4af84286fd7d660076..a9ed29f4ae39681b912dda78c0c5d5e2a40c240f 100644 (file)
@@ -110,9 +110,7 @@ OPDEF(MINT_STFLD_VT, "stfld.vt", 4, MintOpShortAndInt)
 OPDEF(MINT_STRMFLD, "strmfld", 2, MintOpFieldToken)
 OPDEF(MINT_STRMFLD_VT, "strmfld.vt", 4, MintOpShortAndInt)
 
-OPDEF(MINT_LDSFLD, "ldsfld", 3, MintOpTwoShorts)
-OPDEF(MINT_LDSFLD_I4, "ldsfld.i4", 3, MintOpTwoShorts)
-OPDEF(MINT_LDSFLD_O, "ldsfld.o", 3, MintOpTwoShorts)
+OPDEF(MINT_LDSFLD, "ldsfld", 2, MintOpFieldToken)
 OPDEF(MINT_LDSFLD_VT, "ldsfld.vt", 4, MintOpShortAndInt)
 OPDEF(MINT_STSFLD, "stsfld", 2, MintOpUShortInt)
 OPDEF(MINT_STSFLD_VT, "stsfld.vt", 4, MintOpShortAndInt)
@@ -154,7 +152,7 @@ OPDEF(MINT_LDIND_U2, "ldind.u2", 1, MintOpNoArgs)
 OPDEF(MINT_LDIND_I4, "ldind.i4", 1, MintOpNoArgs)
 OPDEF(MINT_LDIND_U4, "ldind.u4", 1, MintOpNoArgs)
 OPDEF(MINT_LDIND_I8, "ldind.i8", 1, MintOpNoArgs)
-OPDEF(MINT_LDIND_I, "ldind.i", 1, MintOpNoArgs)
+OPDEF(MINT_LDIND_I, "ldind.i", 2, MintOpUShortInt)
 OPDEF(MINT_LDIND_R4, "ldind.r4", 1, MintOpNoArgs)
 OPDEF(MINT_LDIND_R8, "ldind.r8", 1, MintOpNoArgs)
 OPDEF(MINT_LDIND_REF, "ldind.ref", 1, MintOpNoArgs)
@@ -273,7 +271,7 @@ OPDEF(MINT_INITOBJ, "initobj", 3, MintOpInt)
 OPDEF(MINT_CASTCLASS, "castclass", 2, MintOpClassToken) 
 OPDEF(MINT_ISINST, "isinst", 2, MintOpClassToken) 
 OPDEF(MINT_NEWARR, "newarr", 2, MintOpClassToken) 
-OPDEF(MINT_BOX, "box", 2, MintOpClassToken) 
+OPDEF(MINT_BOX, "box", 3, MintOpTwoShorts)
 OPDEF(MINT_UNBOX, "unbox", 2, MintOpClassToken) 
 OPDEF(MINT_LDTOKEN, "ldtoken", 2, MintOpClassToken) /* not really */
 OPDEF(MINT_LDFTN, "ldftn", 2, MintOpMethodToken) 
@@ -297,6 +295,7 @@ OPDEF(MINT_LDELEM_I8, "ldelem.i8", 1, MintOpNoArgs)
 OPDEF(MINT_LDELEM_R4, "ldelem.r4", 1, MintOpNoArgs)
 OPDEF(MINT_LDELEM_R8, "ldelem.r8", 1, MintOpNoArgs)
 OPDEF(MINT_LDELEM_REF, "ldelem.ref", 1, MintOpNoArgs)
+OPDEF(MINT_LDELEM_VT, "ldelem.vt", 4, MintOpShortAndInt)
 
 OPDEF(MINT_LDELEMA, "ldelema", 2, MintOpClassToken)
 
@@ -308,6 +307,7 @@ OPDEF(MINT_STELEM_I8, "stelem.i8", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_R4, "stelem.r4", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_R8, "stelem.r8", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_REF, "stelem.ref", 1, MintOpNoArgs)
+OPDEF(MINT_STELEM_VT, "stelem.vt", 4, MintOpShortAndInt)
 
 OPDEF(MINT_LDLEN, "ldlen", 1, MintOpNoArgs)
 
index d1257274ef2aa300b75a70cf18e60777819c1f22..149b45278501a1c8431a2004038564f7dc895383 100644 (file)
@@ -18,6 +18,7 @@
 #include <mono/mini/mini.h>
 
 #include "mintops.h"
+#include "interp-internals.h"
 #include "interp.h"
 
 // TODO: export from marshal.c
@@ -464,10 +465,17 @@ load_arg(TransformData *td, int n)
                        WRITE32 (td, &size);
                }
        } else {
-               ADD_CODE(td, MINT_LDARG_I1 + (mt - MINT_TYPE_I1));
-               ADD_CODE(td, td->rtm->arg_offsets [n]); /* FIX for large offset */
-               if (mt == MINT_TYPE_O)
-                       klass = mono_class_from_mono_type (type);
+               if (hasthis && n == 0) {
+                       mt = MINT_TYPE_P;
+                       ADD_CODE (td, MINT_LDARG_P);
+                       ADD_CODE (td, td->rtm->arg_offsets [n]); /* FIX for large offset */
+                       klass = NULL;
+               } else {
+                       ADD_CODE(td, MINT_LDARG_I1 + (mt - MINT_TYPE_I1));
+                       ADD_CODE(td, td->rtm->arg_offsets [n]); /* FIX for large offset */
+                       if (mt == MINT_TYPE_O)
+                               klass = mono_class_from_mono_type (type);
+               }
        }
        PUSH_TYPE(td, stack_type[mt], klass);
 }
@@ -516,12 +524,12 @@ store_inarg(TransformData *td, int n)
                type = mono_method_signature (td->method)->params [n - !!hasthis];
 
        int mt = mint_type (type);
+       if (hasthis && n == 0) {
+               ADD_CODE (td, MINT_STINARG_P);
+               ADD_CODE (td, n);
+               return;
+       }
        if (mt == MINT_TYPE_VT) {
-               if (hasthis && n == 0) {
-                       ADD_CODE (td, MINT_STINARG_P);
-                       ADD_CODE (td, n);
-                       return;
-               }
                MonoClass *klass = mono_class_from_mono_type (type);
                gint32 size;
                if (mono_method_signature (td->method)->pinvoke)
@@ -628,7 +636,7 @@ get_data_item_index (TransformData *td, void *ptr)
 }
 
 static void
-interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target_method, MonoDomain *domain, MonoGenericContext *generic_context, unsigned char *is_bb_start, int body_start_offset)
+interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target_method, MonoDomain *domain, MonoGenericContext *generic_context, unsigned char *is_bb_start, int body_start_offset, MonoClass *constrained_class)
 {
        MonoImage *image = method->klass->image;
        MonoMethodSignature *csignature;
@@ -678,6 +686,46 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
                csignature = mono_method_signature (target_method);
        }
 
+       if (constrained_class) {
+               if (constrained_class->enumtype && !strcmp (target_method->name, "GetHashCode")) {
+                       /* Use the corresponding method from the base type to avoid boxing */
+                       MonoType *base_type = mono_class_enum_basetype (constrained_class);
+                       g_assert (base_type);
+                       constrained_class = mono_class_from_mono_type (base_type);
+                       target_method = mono_class_get_method_from_name (constrained_class, target_method->name, 0);
+                       g_assert (target_method);
+               }
+       }
+
+       if (constrained_class) {
+               mono_class_setup_vtable (constrained_class);
+#if DEBUG_INTERP
+               g_print ("CONSTRAINED.CALLVIRT: %s::%s.  %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
+#endif
+               target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, &error);
+#if DEBUG_INTERP
+               g_print ("                    : %s::%s.  %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
+#endif
+               mono_error_cleanup (&error); /* FIXME: don't swallow the error */
+               mono_class_setup_vtable (target_method->klass);
+
+               if (constrained_class->valuetype && (target_method->klass == mono_defaults.object_class || target_method->klass == mono_defaults.enum_class->parent || target_method->klass == mono_defaults.enum_class)) {
+                       ADD_CODE (td, MINT_BOX);
+                       ADD_CODE (td, get_data_item_index (td, constrained_class));
+                       ADD_CODE (td, csignature->param_count);
+               } else if (!constrained_class->valuetype) {
+                       /* managed pointer on the stack, we need to deref that puppy */
+                       ADD_CODE (td, MINT_LDIND_I);
+                       ADD_CODE (td, csignature->param_count);
+               } else {
+                       g_assert (target_method->klass->valuetype);
+                       virtual = FALSE;
+               }
+       }
+
+       if (target_method)
+               mono_class_init (target_method->klass);
+
        CHECK_STACK (td, csignature->param_count + csignature->hasthis);
        if (!calli && (!virtual || (target_method->flags & METHOD_ATTRIBUTE_VIRTUAL) == 0) &&
                (target_method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) == 0 && 
@@ -796,6 +844,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
        MonoImage *image = method->klass->image;
        MonoDomain *domain = mono_domain_get ();
        MonoGenericContext *generic_context = NULL;
+       MonoClass *constrained_class = NULL;
        MonoError error;
        int offset, mt;
        int i;
@@ -981,6 +1030,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        td.ip += 2;
                        break;
                case CEE_LDARGA_S: {
+                       /* NOTE: n includes this */
                        int n = ((guint8 *)td.ip)[1];
                        if (n == 0 && signature->hasthis) {
                                g_error ("LDTHISA: NOPE");
@@ -988,7 +1038,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        }
                        else {
                                ADD_CODE(&td, MINT_LDARGA);
-                               ADD_CODE(&td, td.rtm->arg_offsets [n - signature->hasthis]);
+                               ADD_CODE(&td, td.rtm->arg_offsets [n]);
                        }
                        PUSH_SIMPLE_TYPE(&td, STACK_TYPE_MP);
                        td.ip += 2;
@@ -1131,7 +1181,8 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                case CEE_CALLVIRT: /* Fall through */
                case CEE_CALLI:    /* Fall through */
                case CEE_CALL: {
-                       interp_transform_call (&td, method, NULL, domain, generic_context, is_bb_start, body_start_offset);
+                       interp_transform_call (&td, method, NULL, domain, generic_context, is_bb_start, body_start_offset, constrained_class);
+                       constrained_class = NULL;
                        break;
                }
                case CEE_RET: {
@@ -1333,6 +1384,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                case CEE_LDIND_I:
                        CHECK_STACK (&td, 1);
                        SIMPLE_OP (td, MINT_LDIND_I);
+                       ADD_CODE (&td, 0);
                        SET_SIMPLE_TYPE(td.sp - 1, STACK_TYPE_I);
                        break;
                case CEE_LDIND_R4:
@@ -1857,7 +1909,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        } else if (mono_class_is_nullable (klass)) {
                                MonoMethod *target_method = mono_class_get_method_from_name (klass, "Unbox", 1);
                                /* td.ip is incremented by interp_transform_call */
-                               interp_transform_call (&td, method, target_method, domain, generic_context, is_bb_start, body_start_offset);
+                               interp_transform_call (&td, method, target_method, domain, generic_context, is_bb_start, body_start_offset, NULL);
                        } else {
                                int mt = mint_type (&klass->byval_arg);
                                ADD_CODE (&td, MINT_UNBOX);
@@ -1912,6 +1964,9 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                int size = mono_class_value_size (klass, NULL);
                                size = (size + 7) & ~7;
                                td.vt_sp -= size;
+                               ADD_CODE (&td, MINT_VTRESULT);
+                               ADD_CODE (&td, 0);
+                               WRITE32 (&td, &size);
                        }
                        td.ip += 5;
                        SET_TYPE(td.sp - 1, stack_type [mt], field_klass);
@@ -1955,21 +2010,14 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        ADD_CODE(&td, get_data_item_index (&td, field));
                        klass = NULL;
                        if (mt == MINT_TYPE_VT) {
-                               g_error ("data.klass");
-                               int size = mono_class_value_size (field->type->data.klass, NULL);
+                               MonoClass *klass = mono_class_from_mono_type (field->type);
+                               int size = mono_class_value_size (klass, NULL);
                                PUSH_VT(&td, size);
                                WRITE32(&td, &size);
                                klass = field->type->data.klass;
                        } else {
                                if (mt == MINT_TYPE_O) 
                                        klass = mono_class_from_mono_type (field->type);
-                               if (!domain->special_static_fields || !g_hash_table_lookup (domain->special_static_fields, field)) {
-                                       if (mt == MINT_TYPE_O)
-                                               td.new_ip [-2] = MINT_LDSFLD_O;
-                                       else if (mt == MINT_TYPE_I4)
-                                               td.new_ip [-2] = MINT_LDSFLD_I4;
-                               }
-                               ADD_CODE(&td, get_data_item_index (&td, mono_class_vtable (domain, field->parent)));
                        }
                        td.ip += 5;
                        PUSH_TYPE(&td, stack_type [mt], klass);
@@ -1982,10 +2030,10 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        ADD_CODE(&td, mt == MINT_TYPE_VT ? MINT_STSFLD_VT : MINT_STSFLD);
                        ADD_CODE(&td, get_data_item_index (&td, field));
                        if (mt == MINT_TYPE_VT) {
-                               g_error ("data.klass");
-                               int size = mono_class_value_size (field->type->data.klass, NULL);
-                               POP_VT(&td, size);
-                               WRITE32(&td, &size);
+                               MonoClass *klass = mono_class_from_mono_type (field->type);
+                               int size = mono_class_value_size (klass, NULL);
+                               POP_VT (&td, size);
+                               WRITE32 (&td, &size);
                        }
                        td.ip += 5;
                        --td.sp;
@@ -2061,20 +2109,23 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                klass = (MonoClass *)mono_method_get_wrapper_data (method, token);
                        else
                                klass = mono_class_get_full (image, token, generic_context);
-                       g_assert (klass->valuetype);
 
                        if (mono_class_is_nullable (klass)) {
                                MonoMethod *target_method = mono_class_get_method_from_name (klass, "Box", 1);
                                /* td.ip is incremented by interp_transform_call */
-                               interp_transform_call (&td, method, target_method, domain, generic_context, is_bb_start, body_start_offset);
+                               interp_transform_call (&td, method, target_method, domain, generic_context, is_bb_start, body_start_offset, NULL);
+                       } else if (!klass->valuetype) {
+                               /* already boxed, do nothing. */
+                               td.ip += 5;
                        } else {
-                               if (klass->byval_arg.type == MONO_TYPE_VALUETYPE && !klass->enumtype) {
+                               if (mint_type (&klass->byval_arg) == MINT_TYPE_VT && !klass->enumtype) {
                                        size = mono_class_value_size (klass, NULL);
                                        size = (size + 7) & ~7;
                                        td.vt_sp -= size;
                                }
                                ADD_CODE(&td, MINT_BOX);
                                ADD_CODE(&td, get_data_item_index (&td, klass));
+                               ADD_CODE (&td, 0);
                                SET_TYPE(td.sp - 1, STACK_TYPE_O, klass);
                                td.ip += 5;
                        }
@@ -2204,6 +2255,17 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                        --td.sp;
                                        SET_SIMPLE_TYPE(td.sp - 1, STACK_TYPE_I4);
                                        break;
+                               case MINT_TYPE_VT: {
+                                       int size = mono_class_value_size (klass, NULL);
+                                       ENSURE_I4 (&td, 1);
+                                       SIMPLE_OP (td, MINT_LDELEM_VT);
+                                       ADD_CODE (&td, get_data_item_index (&td, klass));
+                                       WRITE32 (&td, &size);
+                                       --td.sp;
+                                       SET_SIMPLE_TYPE(td.sp - 1, STACK_TYPE_VT);
+                                       PUSH_VT (&td, size);
+                                       break;
+                               }
                                default: {
                                        GString *res = g_string_new ("");
                                        mono_type_get_desc (res, &klass->byval_arg, TRUE);
@@ -2272,6 +2334,17 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                case MINT_TYPE_I4:
                                        SIMPLE_OP (td, MINT_STELEM_I4);
                                        break;
+                               case MINT_TYPE_O:
+                                       SIMPLE_OP (td, MINT_STELEM_REF);
+                                       break;
+                               case MINT_TYPE_VT: {
+                                       int size = mono_class_value_size (klass, NULL);
+                                       SIMPLE_OP (td, MINT_STELEM_VT);
+                                       ADD_CODE (&td, get_data_item_index (&td, klass));
+                                       WRITE32 (&td, &size);
+                                       POP_VT (&td, size);
+                                       break;
+                               }
                                default: {
                                        GString *res = g_string_new ("");
                                        mono_type_get_desc (res, &klass->byval_arg, TRUE);
@@ -2521,7 +2594,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                        switch (*td.ip) {
                                case CEE_MONO_CALLI_EXTRA_ARG:
                                        /* Same as CEE_CALLI, llvm specific */
-                                       interp_transform_call (&td, method, NULL, domain, generic_context, is_bb_start, body_start_offset);
+                                       interp_transform_call (&td, method, NULL, domain, generic_context, is_bb_start, body_start_offset, NULL);
                                        break;
                                case CEE_MONO_ICALL: {
                                        guint32 token;
@@ -2765,7 +2838,7 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                }
                                else {
                                        ADD_CODE(&td, MINT_LDARGA);
-                                       ADD_CODE(&td, td.rtm->arg_offsets [n - signature->hasthis]); /* FIX for large offsets */
+                                       ADD_CODE(&td, td.rtm->arg_offsets [n]); /* FIX for large offsets */
                                }
                                PUSH_SIMPLE_TYPE(&td, STACK_TYPE_MP);
                                td.ip += 3;
@@ -2834,16 +2907,12 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start)
                                td.sp -= 3;
                                ++td.ip;
                                break;
-#if 0
-                       case CEE_CONSTRAINED_: {
-                               guint32 token;
-                               /* FIXME: implement */
-                               ++ip;
-                               token = read32 (ip);
-                               ip += 4;
+                       case CEE_CONSTRAINED_:
+                               token = read32 (td.ip + 1);
+                               constrained_class = mono_class_get_full (image, token, generic_context);
+                               mono_class_init (constrained_class);
+                               td.ip += 5;
                                break;
-                       }
-#endif
                        case CEE_INITBLK:
                                CHECK_STACK(&td, 3);
                                ADD_CODE(&td, MINT_INITBLK);
index 38ba5a241ec8e3d6373fd107c6513bccec045f9d..09bab4683ef57335c2209792745f8b4ea6546db0 100644 (file)
@@ -4450,7 +4450,7 @@ handle_constrained_gsharedvt_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMe
         * pack the arguments into an array, and do the rest of the work in in an icall.
         */
        if (((cmethod->klass == mono_defaults.object_class) || mono_class_is_interface (cmethod->klass) || (!cmethod->klass->valuetype && cmethod->klass->image != mono_defaults.corlib)) &&
-               (MONO_TYPE_IS_VOID (fsig->ret) || MONO_TYPE_IS_PRIMITIVE (fsig->ret) || MONO_TYPE_IS_REFERENCE (fsig->ret) || MONO_TYPE_ISSTRUCT (fsig->ret) || mini_is_gsharedvt_type (fsig->ret)) &&
+               (MONO_TYPE_IS_VOID (fsig->ret) || MONO_TYPE_IS_PRIMITIVE (fsig->ret) || MONO_TYPE_IS_REFERENCE (fsig->ret) || MONO_TYPE_ISSTRUCT (fsig->ret) || mono_class_is_enum (mono_class_from_mono_type (fsig->ret)) || mini_is_gsharedvt_type (fsig->ret)) &&
                (fsig->param_count == 0 || (!fsig->hasthis && fsig->param_count == 1) || (fsig->param_count == 1 && (MONO_TYPE_IS_REFERENCE (fsig->params [0]) || fsig->params [0]->byref || mini_is_gsharedvt_type (fsig->params [0]))))) {
                MonoInst *args [16];
 
@@ -4502,7 +4502,7 @@ handle_constrained_gsharedvt_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMe
 
                if (mini_is_gsharedvt_type (fsig->ret)) {
                        ins = handle_unbox_gsharedvt (cfg, mono_class_from_mono_type (fsig->ret), ins);
-               } else if (MONO_TYPE_IS_PRIMITIVE (fsig->ret) || MONO_TYPE_ISSTRUCT (fsig->ret)) {
+               } else if (MONO_TYPE_IS_PRIMITIVE (fsig->ret) || MONO_TYPE_ISSTRUCT (fsig->ret) || mono_class_is_enum (mono_class_from_mono_type (fsig->ret))) {
                        MonoInst *add;
 
                        /* Unbox */
index 42715480b0005e5969b924da1773fd3b46488759..f85644d42ca6d5446732a7427bb27e48b48d9177 100644 (file)
@@ -1515,6 +1515,7 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
                        nwords = (align_size + sizeof (gpointer) -1 ) / sizeof (gpointer);
                        ainfo->storage = RegTypeStructByVal;
                        ainfo->struct_size = size;
+                       ainfo->align = align;
                        /* FIXME: align stack_size if needed */
                        if (eabi_supported) {
                                if (align >= 8 && (gr & 1))
@@ -2166,7 +2167,16 @@ mono_arch_get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)
                        break;
                case RegTypeStructByVal:
                        lainfo->storage = LLVMArgAsIArgs;
-                       lainfo->nslots = ainfo->struct_size / sizeof (gpointer);
+                       if (eabi_supported && ainfo->align == 8) {
+                               /* LLVM models this by passing an int64 array */
+                               lainfo->nslots = ALIGN_TO (ainfo->struct_size, 8) / 8;
+                               lainfo->esize = 8;
+                       } else {
+                               lainfo->nslots = ainfo->struct_size / sizeof (gpointer);
+                               lainfo->esize = 4;
+                       }
+
+                       printf ("D: %d\n", ainfo->align);
                        break;
                case RegTypeStructByAddr:
                case RegTypeStructByAddrOnStack:
index 28678638b6c0e46c3592214e34b8093e399f4d39..31194f2e60d596b17facb97b744e482f3abb3864 100644 (file)
@@ -208,7 +208,7 @@ typedef struct {
        guint8  reg;
        ArgStorage  storage;
        /* RegTypeStructByVal */
-       gint32  struct_size;
+       gint32  struct_size, align;
        guint8  size    : 4; /* 1, 2, 4, 8, or regs used by RegTypeStructByVal */
 } ArgInfo;
 
index 563607f8c0fbeb4b48eba4b4103a1c94729623ff..745c29f13e48c77af959d7d831544421eda14bcf 100644 (file)
@@ -1431,7 +1431,10 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
                        pindex ++;
                        break;
                case LLVMArgAsIArgs:
-                       param_types [pindex] = LLVMArrayType (IntPtrType (), ainfo->nslots);
+                       if (ainfo->esize == 8)
+                               param_types [pindex] = LLVMArrayType (LLVMInt64Type (), ainfo->nslots);
+                       else
+                               param_types [pindex] = LLVMArrayType (IntPtrType (), ainfo->nslots);
                        pindex ++;
                        break;
                case LLVMArgVtypeByRef:
@@ -3490,7 +3493,10 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
                }
                case LLVMArgAsIArgs:
                        g_assert (addresses [reg]);
-                       args [pindex] = LLVMBuildLoad (ctx->builder, convert (ctx, addresses [reg], LLVMPointerType (LLVMArrayType (IntPtrType (), ainfo->nslots), 0)), "");
+                       if (ainfo->esize == 8)
+                               args [pindex] = LLVMBuildLoad (ctx->builder, convert (ctx, addresses [reg], LLVMPointerType (LLVMArrayType (LLVMInt64Type (), ainfo->nslots), 0)), "");
+                       else
+                               args [pindex] = LLVMBuildLoad (ctx->builder, convert (ctx, addresses [reg], LLVMPointerType (LLVMArrayType (IntPtrType (), ainfo->nslots), 0)), "");
                        break;
                case LLVMArgVtypeAsScalar:
                        g_assert_not_reached ();
index 9eade804217ea75654fc94e2b1a1e5eb3ecfa823..a567bf0507fb77771f28e305a07674418a0f5e63 100644 (file)
@@ -66,6 +66,7 @@
 #include <mono/utils/mono-threads-coop.h>
 #include <mono/utils/checked-build.h>
 #include <mono/metadata/w32handle.h>
+#include <mono/metadata/threadpool.h>
 
 #include "mini.h"
 #include "seq-points.h"
 #endif
 #endif
 
+#ifdef ENABLE_INTERPRETER
+#include "interpreter/interp.h"
+#endif
+
 static guint32 default_opt = 0;
 static gboolean default_opt_set = FALSE;
 
@@ -1769,7 +1774,7 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoError *er
 
 #ifdef ENABLE_INTERPRETER
        if (mono_use_interpreter)
-               return interp_create_method_pointer (method, error);
+               return mono_interp_create_method_pointer (method, error);
 #endif
 
        if (mono_llvm_only)
@@ -2359,7 +2364,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
 
 #ifdef ENABLE_INTERPRETER
        if (mono_use_interpreter)
-               return interp_mono_runtime_invoke (method, obj, params, exc, error);
+               return mono_interp_runtime_invoke (method, obj, params, exc, error);
 #endif
 
        mono_error_init (error);
@@ -4106,6 +4111,8 @@ mini_cleanup (MonoDomain *domain)
        mono_runtime_cleanup (domain);
 #endif
 
+       mono_threadpool_cleanup ();
+
        mono_profiler_shutdown ();
 
        free_jit_tls_data ((MonoJitTlsData *)mono_tls_get_jit_tls ());
index 60911597d97062a1ff48288d0b233a9fec6066a0..d8e9f9ca547311b597c6fa42f6a1e599a26ec0b4 100644 (file)
@@ -826,7 +826,7 @@ typedef struct {
         * in the structure.
         */
        int nslots;
-       /* Only if storage == LLVMArgAsFpArgs/LLVMArgFpStruct (4/8) */
+       /* Only if storage == LLVMArgAsIArgs/LLVMArgAsFpArgs/LLVMArgFpStruct (4/8) */
        int esize;
        /* Parameter index in the LLVM signature */
        int pindex;
@@ -2085,12 +2085,6 @@ typedef struct {
        int type;
 } StackSlot;
 
-#if HAVE_ARRAY_ELEM_INIT
-extern const guint8 mono_burg_arity [];
-#else
-extern guint8 mono_burg_arity [];
-#endif
-
 extern const char MONO_ARCH_CPU_SPEC [];
 #define MONO_ARCH_CPU_SPEC_IDX_COMBINE(a) a ## _idx
 #define MONO_ARCH_CPU_SPEC_IDX(a) MONO_ARCH_CPU_SPEC_IDX_COMBINE(a)
@@ -2820,12 +2814,7 @@ void    mono_arch_notify_pending_exc            (MonoThreadInfo *info);
 guint8* mono_arch_get_call_target               (guint8 *code);
 guint32 mono_arch_get_plt_info_offset           (guint8 *plt_entry, mgreg_t *regs, guint8 *code);
 GSList *mono_arch_get_trampolines               (gboolean aot);
-#ifdef ENABLE_INTERPRETER
-gpointer mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info);
-void mono_interp_init (void);
-gpointer interp_create_method_pointer (MonoMethod *method, MonoError *error);
-MonoObject* interp_mono_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error);
-#endif
+gpointer mono_arch_get_enter_icall_trampoline   (MonoTrampInfo **info);
 
 /* Handle block guard */
 gpointer mono_arch_install_handler_block_guard (MonoJitInfo *ji, MonoJitExceptionInfo *clause, MonoContext *ctx, gpointer new_value);
index f378cd205975116ef86c5aefde7e4267d99b545b..3aa8a24aaf45ad48caba52720f067ee06133f6ad 100644 (file)
@@ -473,6 +473,7 @@ class Tests {
                return o.GetHashCode ();
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_unbox_trampoline2 () {
                int i = 12;
                object o = i;
@@ -622,6 +623,7 @@ class Tests {
                return 0;
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_multi_array_cast () {
                Duper[,] d = new Duper [1, 1];
                object[,] o = d;
@@ -888,18 +890,21 @@ class Tests {
                }
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_42_vtype_delegate () {
                var s = new VtypeVirtualDelStruct () { f = 42 };
                Func<int> f = s.return_field_nonvirt;
                return f ();
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_42_vtype_virtual_delegate () {
                IFaceVirtualDel s = new VtypeVirtualDelStruct () { f = 42 };
                Func<int> f = s.return_field;
                return f ();
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_1_store_decimal () {
                decimal[,] a = {{1}};
 
@@ -1418,6 +1423,7 @@ ncells ) {
                return 0;
        }
 
+       [Category ("!INTERPRETER")]
        static int test_0_array_get_set_soft_float () {
                float[,] arr = new float [2, 2];
                arr [0, 0] = 256f;
@@ -1578,6 +1584,7 @@ ncells ) {
                return mInstance;
        }
 
+       [Category ("!INTERPRETER")]
        static int test_0_synchronized () {
                getInstance ();
                return 0;
@@ -1746,6 +1753,7 @@ ncells ) {
                }
        }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_delegate_to_virtual_generic_on_ifaces () {
                IComparer2 c = new AClass ();
 
@@ -1768,6 +1776,7 @@ ncells ) {
 
        enum Mine { One, Two }
 
+       [Category ("!INTERPRETER")]
        public static int test_0_enum_gethashcode_opt () {
                int sum = 0;
         for (int i = 0; i < 1000000; ++i)
index c86f9b5091587f95cd613b8753239ccdf64a35e6..b143645fb7d83c9d70d04ac4e9f6d2f9d81b9ded 100644 (file)
@@ -969,9 +969,8 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
 
        return buf;
 }
+#endif /* !DISABLE_JIT */
 
-
-#ifdef ENABLE_INTERPRETER
 /*
  * mono_arch_get_enter_icall_trampoline:
  *
@@ -982,11 +981,13 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
 gpointer
 mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
 {
-       guint8 *start = NULL, *code, *exits[4], *leave_tramp;
+#ifdef ENABLE_INTERPRETER
+       const int gregs_num = 6;
+       guint8 *start = NULL, *code, *exits [gregs_num], *leave_tramp;
        MonoJumpInfo *ji = NULL;
        GSList *unwind_ops = NULL;
-       static int arg_regs[] = {AMD64_ARG_REG1, AMD64_ARG_REG2, AMD64_ARG_REG3, AMD64_ARG_REG4};
-       int i;
+       static int arg_regs[] = {AMD64_ARG_REG1, AMD64_ARG_REG2, AMD64_ARG_REG3, AMD64_ARG_REG4, AMD64_R8, AMD64_R9};
+       int i, offset = 0;
 
        start = code = (guint8 *) mono_global_codeman_reserve (256);
 
@@ -1007,16 +1008,29 @@ mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
        /* load pointer to iregs into R11 */ // TODO: struct offset
        amd64_mov_reg_membase (code, AMD64_R11, AMD64_R11, 8, 8);
 
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < gregs_num; i++) {
                amd64_test_reg_reg (code, AMD64_RAX, AMD64_RAX);
                exits [i] = code;
                x86_branch8 (code, X86_CC_Z, 0, FALSE);
 
-               amd64_mov_reg_membase (code, arg_regs [i], AMD64_R11, i * sizeof (gpointer), 8);
+#ifdef TARGET_WIN32
+               if (i < 4) {
+#else
+               if (i < 6) {
+#endif
+                       amd64_mov_reg_membase (code, arg_regs [i], AMD64_R11, i * sizeof (gpointer), 8);
+               } else {
+                       g_error ("not tested yet.");
+                       amd64_push_reg (code, AMD64_RAX);
+                       amd64_mov_reg_membase (code, AMD64_RAX, AMD64_R11, i * sizeof (gpointer), 8);
+                       amd64_mov_membase_reg (code, AMD64_RBP, offset, AMD64_RAX, sizeof (gpointer));
+                       offset += sizeof (gpointer);
+                       amd64_pop_reg (code, AMD64_RAX);
+               }
                amd64_dec_reg_size (code, AMD64_RAX, 1);
        }
 
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < gregs_num; i++) {
                x86_patch (exits [i], code);
        }
 
@@ -1049,9 +1063,11 @@ mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
                *info = mono_tramp_info_create ("enter_icall_trampoline", start, code - start, ji, unwind_ops);
 
        return start;
+#else
+       g_assert_not_reached ();
+       return NULL;
+#endif /* ENABLE_INTERPRETER */
 }
-#endif
-#endif /* !DISABLE_JIT */
 
 #ifdef DISABLE_JIT
 gpointer
@@ -1117,12 +1133,10 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        return NULL;
 }
 
-#ifdef ENABLE_INTERPRETER
 gpointer
 mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
 {
        g_assert_not_reached ();
        return NULL;
 }
-#endif
 #endif /* DISABLE_JIT */
index cc1930bcc2f443a65b4c536208051e89a119e94f..77c9413ac6c9a540283f3947a9a0a7b177968888 100644 (file)
@@ -330,7 +330,9 @@ marker_idle_func (void *data_untyped)
                if (data->private_gray_queue.num_sections > 16 && workers_finished && worker_awakenings < active_workers_num) {
                        /* We bound the number of worker awakenings just to be sure */
                        worker_awakenings++;
+                       mono_os_mutex_lock (&finished_lock);
                        sgen_workers_ensure_awake ();
+                       mono_os_mutex_unlock (&finished_lock);
                }
        } else {
                worker_try_finish (data);
@@ -424,7 +426,13 @@ sgen_workers_start_all_workers (SgenObjectOperations *object_ops_nopar, SgenObje
        worker_awakenings = 0;
        mono_memory_write_barrier ();
 
+       /*
+        * We expect workers to start finishing only after all of them were awaken.
+        * Otherwise we might think that we have fewer workers and use wrong context.
+        */
+       mono_os_mutex_lock (&finished_lock);
        sgen_workers_ensure_awake ();
+       mono_os_mutex_unlock (&finished_lock);
 }
 
 void
index 58ca018ac9b8d426153dd6b2067a9c288f337cf5..d809141dcf49510d0ef7a20d69575f0992b1f95f 100644 (file)
@@ -1763,7 +1763,8 @@ UNHANDLED_EXCEPTION_255_TESTS =   \
        unhandled-exception-4.exe       \
        unhandled-exception-5.exe       \
        unhandled-exception-6.exe       \
-       unhandled-exception-7.exe
+       unhandled-exception-7.exe       \
+       unhandled-exception-8.exe
 
 test-unhandled-exception-2: $(UNHANDLED_EXCEPTION_1_TESTS) $(UNHANDLED_EXCEPTION_255_TESTS)
        $(MAKE) test-unhandled-exception-2-1-with-managed-handler
diff --git a/mono/tests/unhandled-exception-8.cs b/mono/tests/unhandled-exception-8.cs
new file mode 100644 (file)
index 0000000..7b4de0e
--- /dev/null
@@ -0,0 +1,24 @@
+
+using System;
+using System.Threading;
+
+class CustomException : Exception
+{
+}
+
+class Driver
+{
+       /* expected exit code: 255 */
+       public static void Main ()
+       {
+               if (Environment.GetEnvironmentVariable ("TEST_UNHANDLED_EXCEPTION_HANDLER") != null)
+                       AppDomain.CurrentDomain.UnhandledException += (s, e) => {};
+
+               ManualResetEvent mre = new ManualResetEvent(false);
+
+               ThreadPool.RegisterWaitForSingleObject (mre, (state, timedOut) => { throw new CustomException (); }, null, -1, true);
+               mre.Set();
+
+               Thread.Sleep (5000);
+       }
+}
\ No newline at end of file
index 25dd54a92576e995e679a27356d15ee6c9f19bea..ccad6f00ddb385a62e48f1cd831f690a00a11a6a 100755 (executable)
@@ -3414,7 +3414,7 @@ done
 
 ./make_exception_overlap_test.sh exception_entry_overlap_try_over_filter invalid ".try TRY_BLOCK_1 to FILTER_BLOCK_3_A filter FILTER_BLOCK_3 handler CATCH_BLOCK_1 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END" "yes"
 
-#blocks start in the middle of an intruction
+#blocks start in the middle of an instruction
 ./make_exception_overlap_test.sh try_block_start_in_the_middle_of_a_instruction invalid ".try AFTER_PREFIX_1 to TRY_BLOCK_1_END catch [mscorlib]System.Exception handler CATCH_BLOCK_1 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END"
 
 ./make_exception_overlap_test.sh catch_block_start_in_the_middle_of_a_instruction invalid ".try TRY_BLOCK_1 to TRY_BLOCK_1_END catch [mscorlib]System.Exception handler AFTER_PREFIX_2 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END"
index 09926ffcd5f2266ce632b71bf837ec8dc73c9c5e..51524916490be41b7181cf2cb0c697f5745dcdd6 100644 (file)
@@ -245,7 +245,7 @@ mono_fatal_with_history (const char *msg, ...)
 #ifdef ENABLE_CHECKED_BUILD_GC
 
 void
-assert_gc_safe_mode (void)
+assert_gc_safe_mode (const char *file, int lineno)
 {
        if (!mono_check_mode_enabled (MONO_CHECK_MODE_GC))
                return;
@@ -254,19 +254,19 @@ assert_gc_safe_mode (void)
        int state;
 
        if (!cur)
-               mono_fatal_with_history ("Expected GC Safe mode but thread is not attached");
+               mono_fatal_with_history ("%s:%d: Expected GC Safe mode but thread is not attached", file, lineno);
 
        switch (state = mono_thread_info_current_state (cur)) {
        case STATE_BLOCKING:
        case STATE_BLOCKING_AND_SUSPENDED:
                break;
        default:
-               mono_fatal_with_history ("Expected GC Safe mode but was in %s state", mono_thread_state_name (state));
+               mono_fatal_with_history ("%s:%d: Expected GC Safe mode but was in %s state", file, lineno, mono_thread_state_name (state));
        }
 }
 
 void
-assert_gc_unsafe_mode (void)
+assert_gc_unsafe_mode (const char *file, int lineno)
 {
        if (!mono_check_mode_enabled (MONO_CHECK_MODE_GC))
                return;
@@ -275,7 +275,7 @@ assert_gc_unsafe_mode (void)
        int state;
 
        if (!cur)
-               mono_fatal_with_history ("Expected GC Unsafe mode but thread is not attached");
+               mono_fatal_with_history ("%s:%d: Expected GC Unsafe mode but thread is not attached", file, lineno);
 
        switch (state = mono_thread_info_current_state (cur)) {
        case STATE_RUNNING:
@@ -283,12 +283,12 @@ assert_gc_unsafe_mode (void)
        case STATE_SELF_SUSPEND_REQUESTED:
                break;
        default:
-               mono_fatal_with_history ("Expected GC Unsafe mode but was in %s state", mono_thread_state_name (state));
+               mono_fatal_with_history ("%s:%d: Expected GC Unsafe mode but was in %s state", file, lineno, mono_thread_state_name (state));
        }
 }
 
 void
-assert_gc_neutral_mode (void)
+assert_gc_neutral_mode (const char *file, int lineno)
 {
        if (!mono_check_mode_enabled (MONO_CHECK_MODE_GC))
                return;
@@ -297,7 +297,7 @@ assert_gc_neutral_mode (void)
        int state;
 
        if (!cur)
-               mono_fatal_with_history ("Expected GC Neutral mode but thread is not attached");
+               mono_fatal_with_history ("%s:%d: Expected GC Neutral mode but thread is not attached", file, lineno);
 
        switch (state = mono_thread_info_current_state (cur)) {
        case STATE_RUNNING:
@@ -307,7 +307,7 @@ assert_gc_neutral_mode (void)
        case STATE_BLOCKING_AND_SUSPENDED:
                break;
        default:
-               mono_fatal_with_history ("Expected GC Neutral mode but was in %s state", mono_thread_state_name (state));
+               mono_fatal_with_history ("%s:%d: Expected GC Neutral mode but was in %s state", file, lineno, mono_thread_state_name (state));
        }
 }
 
index 3dcbe286cca7ee4da0924ddf14f8e010e40607b7..8648fd81e432491355898297111d30b75fafa435 100644 (file)
@@ -106,15 +106,15 @@ Functions that can be called from both coop or preept modes.
 */
 
 #define MONO_REQ_GC_SAFE_MODE do {     \
-       assert_gc_safe_mode (); \
+       assert_gc_safe_mode (__FILE__, __LINE__);       \
 } while (0);
 
 #define MONO_REQ_GC_UNSAFE_MODE do {   \
-       assert_gc_unsafe_mode ();       \
+       assert_gc_unsafe_mode (__FILE__, __LINE__);     \
 } while (0);
 
 #define MONO_REQ_GC_NEUTRAL_MODE do {  \
-       assert_gc_neutral_mode ();      \
+       assert_gc_neutral_mode (__FILE__, __LINE__);    \
 } while (0);
 
 /* In a GC critical region, the thread is not allowed to switch to GC safe mode.
@@ -140,9 +140,9 @@ Functions that can be called from both coop or preept modes.
                assert_in_gc_critical_region(); \
        } while(0)
 
-void assert_gc_safe_mode (void);
-void assert_gc_unsafe_mode (void);
-void assert_gc_neutral_mode (void);
+void assert_gc_safe_mode (const char *file, int lineno);
+void assert_gc_unsafe_mode (const char *file, int lineno);
+void assert_gc_neutral_mode (const char *file, int lineno);
 
 void* critical_gc_region_begin(void);
 void critical_gc_region_end(void* token);
index 0d474ecf4846becdedd68426408764a71d304e09..3a6f44636c88a90af290d063274291f3fb432cd0 100644 (file)
@@ -139,7 +139,8 @@ typedef struct {
                 }                                                                                                                              \
        } while (0)
 #else
-#define MONO_CONTEXT_GET_CURRENT(ctx) \
+
+#define MONO_CONTEXT_GET_CURRENT_GREGS(ctx) \
        __asm__ __volatile__(   \
        "movl $0x0, %c[eax](%0)\n" \
        "mov %%ebx, %c[ebx](%0)\n" \
@@ -162,6 +163,40 @@ typedef struct {
                [esi] MONO_CONTEXT_OFFSET (esi, 0, mgreg_t), \
                [edi] MONO_CONTEXT_OFFSET (edi, 0, mgreg_t) \
        : "memory")
+
+#ifdef UCONTEXT_REG_XMM
+#define MONO_CONTEXT_GET_CURRENT_FREGS(ctx) \
+       do { \
+               __asm__ __volatile__ ( \
+                       "movups %%xmm0, %c[xmm0](%0)\n" \
+                       "movups %%xmm1, %c[xmm1](%0)\n" \
+                       "movups %%xmm2, %c[xmm2](%0)\n" \
+                       "movups %%xmm3, %c[xmm3](%0)\n" \
+                       "movups %%xmm4, %c[xmm4](%0)\n" \
+                       "movups %%xmm5, %c[xmm5](%0)\n" \
+                       "movups %%xmm6, %c[xmm6](%0)\n" \
+                       "movups %%xmm7, %c[xmm7](%0)\n" \
+                       : \
+                       : "a" (&(ctx)), \
+                               [xmm0] MONO_CONTEXT_OFFSET (fregs, X86_XMM0, MonoContextSimdReg), \
+                               [xmm1] MONO_CONTEXT_OFFSET (fregs, X86_XMM1, MonoContextSimdReg), \
+                               [xmm2] MONO_CONTEXT_OFFSET (fregs, X86_XMM2, MonoContextSimdReg), \
+                               [xmm3] MONO_CONTEXT_OFFSET (fregs, X86_XMM3, MonoContextSimdReg), \
+                               [xmm4] MONO_CONTEXT_OFFSET (fregs, X86_XMM4, MonoContextSimdReg), \
+                               [xmm5] MONO_CONTEXT_OFFSET (fregs, X86_XMM5, MonoContextSimdReg), \
+                               [xmm6] MONO_CONTEXT_OFFSET (fregs, X86_XMM6, MonoContextSimdReg), \
+                               [xmm7] MONO_CONTEXT_OFFSET (fregs, X86_XMM7, MonoContextSimdReg), \
+       } while (0)
+#else
+#define MONO_CONTEXT_GET_CURRENT_FREGS(ctx)
+#endif
+
+#define MONO_CONTEXT_GET_CURRENT(ctx) \
+    do {       \
+               MONO_CONTEXT_GET_CURRENT_GREGS(ctx);    \
+               MONO_CONTEXT_GET_CURRENT_FREGS(ctx);    \
+       } while (0)
+
 #endif
 
 #define MONO_ARCH_HAS_MONO_CONTEXT 1
index 7deca1275f5f26f39602ad5404a5d061ef5cc94a..046ef46d6b181684b2d86affafbff3d9ce4b1f46 100644 (file)
@@ -52,7 +52,7 @@ enum {
        MONO_LAZY_INIT_STATUS_CLEANED,
 };
 
-static inline void
+static inline gboolean
 mono_lazy_initialize (mono_lazy_init_t *lazy_init, void (*initialize) (void))
 {
        gint32 status;
@@ -62,7 +62,7 @@ mono_lazy_initialize (mono_lazy_init_t *lazy_init, void (*initialize) (void))
        status = *lazy_init;
 
        if (status >= MONO_LAZY_INIT_STATUS_INITIALIZED)
-               return;
+               return status == MONO_LAZY_INIT_STATUS_INITIALIZED;
        if (status == MONO_LAZY_INIT_STATUS_INITIALIZING
             || InterlockedCompareExchange (lazy_init, MONO_LAZY_INIT_STATUS_INITIALIZING, MONO_LAZY_INIT_STATUS_NOT_INITIALIZED)
                 != MONO_LAZY_INIT_STATUS_NOT_INITIALIZED
@@ -70,12 +70,13 @@ mono_lazy_initialize (mono_lazy_init_t *lazy_init, void (*initialize) (void))
                while (*lazy_init == MONO_LAZY_INIT_STATUS_INITIALIZING)
                        mono_thread_info_yield ();
                g_assert (InterlockedRead (lazy_init) >= MONO_LAZY_INIT_STATUS_INITIALIZED);
-               return;
+               return status == MONO_LAZY_INIT_STATUS_INITIALIZED;
        }
 
        initialize ();
 
        mono_atomic_store_release (lazy_init, MONO_LAZY_INIT_STATUS_INITIALIZED);
+       return TRUE;
 }
 
 static inline void
index 74d39ced0c0292f1c365af67aa5ad8fc8351e9a0..d81b4eb9168f050626d4afd5ab31628fd5d061fa 100755 (executable)
@@ -60,7 +60,7 @@ mono_poll (mono_pollfd *ufds, unsigned int nfds, int timeout)
                        return 1;
                }
 #else
-               if (fd > FD_SETSIZE) {
+               if (fd >= FD_SETSIZE) {
                        ufds [i].revents = MONO_POLLNVAL;
                        return 1;
                }
index b86ab331dbf7e2cab2180e69cef51ae5060c10a4..2f6b6c501037c6cd070612896455c227b3f2b9ae 100644 (file)
@@ -211,10 +211,10 @@ mono_bitset_count (const MonoBitSet *set) {
        for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) {
                d = set->data [i];
 #ifdef __GNUC__
-               if (sizeof (gsize) == sizeof (unsigned long))
-                       count += __builtin_popcountl (d);
-               else
+               if (sizeof (gsize) == sizeof (unsigned int))
                        count += __builtin_popcount (d);
+               else
+                       count += __builtin_popcountll (d);
 #else
                while (d) {
                        count ++;
index 625cd5c8e9f1ad750a44f5c0ac2638b2e6c76bde..f16745292f51b9ea8239bda4efad0ec6e76bf8f1 100644 (file)
     </project>
     <project dir="class/Microsoft.CSharp" library="Microsoft.CSharp-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/Mono.CSharp.dll</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.dll</flags>
       <output>Microsoft.CSharp.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/Microsoft.CSharp.dll</library_output>
diff --git a/po/mcs/.gitattributes b/po/mcs/.gitattributes
new file mode 100644 (file)
index 0000000..813b603
--- /dev/null
@@ -0,0 +1 @@
+LINGUAS eol=lf
index 5751de4be9b6bf8c36b01cc6fd82ee31dc52ce58..2f03aa0e2ecf8e810e0fdc3855c4fa0e5cc41746 100644 (file)
@@ -1,4 +1 @@
-es
-ja
-de
-pt_BR
\ No newline at end of file
+es ja de pt_BR
\ No newline at end of file
diff --git a/runtime/.gitattributes b/runtime/.gitattributes
new file mode 100644 (file)
index 0000000..943f7e1
--- /dev/null
@@ -0,0 +1,3 @@
+monodis-wrapper.in     crlf=input
+mono-wrapper.in        crlf=input
+
index 30238150d93ca546c3ba77e37149970d7a664127..2166c5ce95c3144272d577900ed2275ba440971f 100644 (file)
@@ -6,3 +6,17 @@ monodocs2slashdoc      crlf=input
 mono-heapviz   crlf=input
 mono-package-runtime   crlf=input
 mono-test-install      crlf=input
+csc.in crlf=input
+dmcs.in        crlf=input
+gmcs.in        crlf=input
+mcs.in crlf=input
+mod.in crlf=input
+mono-configuration-crypto.in   crlf=input
+mono-find-provides.in  crlf=input
+mono-find-requires.in  crlf=input
+mono-service.in        crlf=input
+mono-symbolicate.in    crlf=input
+peverify.in    crlf=input
+script.in      crlf=input
+script_umask.in        crlf=input
+xbuild.in      crlf=input
index 13890c1051ff1b880ce6379ee7180651d6b73eb0..f8e2f2d79dec35f64fb31ef629b043b73f6135c8 100755 (executable)
@@ -50,7 +50,7 @@ if [ -x "/usr/bin/dpkg-architecture" ];
        EXTRA_CONF_FLAGS="$EXTRA_CONF_FLAGS --host=`/usr/bin/dpkg-architecture -qDEB_HOST_GNU_TYPE`"
        #force build arch = dpkg arch, sometimes misdetected
        mkdir -p ~/.config/.mono/
-       wget -qO- http://download.mono-project.com/test/new-certs.tgz| tar zx -C ~/.config/.mono/
+       wget -qO- https://download.mono-project.com/test/new-certs.tgz| tar zx -C ~/.config/.mono/
 fi
 
 ${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh $EXTRA_CONF_FLAGS