WIP: Throw MemberAccessException when abstract class is used with newobj instruction

.editorconfig

@@ -0,0 +1,28 @@
+# see http://editorconfig.org/ for docs on this file
+
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
+
+# this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
+# the settings are meant to closely match what VS does to minimize unnecessary diffs. this duplicates some settings in *
+# but let's be explicit here to be safe (in case someone wants to copy-paste this out to another .editorconfig).
+[*.{vcxproj,vcxproj.filters,csproj,props,targets}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+[*.{sln,sln.template}]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false

.gitmodules

@@ -58,3 +58,6 @@
 [submodule "external/api-snapshot"]
 	path = external/api-snapshot
 	url = git://github.com/mono/api-snapshot.git
+[submodule "external/bdwgc"]
+	path = external/bdwgc
+	url = git://github.com/Unity-Technologies/bdwgc.git

Makefile.am

@@ -17,9 +17,9 @@ else
 support_dir =
 endif
 
-SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+SUBDIRS = po $(libgc_dir) $(bdwgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 po $(libgc_dir) $(bdwgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
 
 all: update_submodules
 

README.md

@@ -1,3 +1,47 @@
+Unity
+============================
+This is Unity Technologies fork of the open source mono project.
+
+### Versions
+Each Unity release contains two versions of Mono. One older version (Mono) is embedded into the Editor and Players. Another newer version (MonoBleedingEdge) is used to run tools and tests.
+
+In newer Unity versions (2017.1+) this MonoBleedingEdge version can be used in the Editor and Players via enabling an Experimental player setting.
+
+### Branch Naming Convention
+Branches for released Unity versions are of the form unity-\<version\>\[-mbe\][-staging\]. The '-staging' suffix is used as a branch for PRs to target with potential changes. The '-mbe' suffix indicates the branch is for the MonoBleedingEdge version of Mono mentioned above.
+
+### Branches
+
+#### Trunk
+* [unity-trunk (PR to this branch for Mono)](https://github.com/Unity-Technologies/mono/tree/unity-trunk)
+* [unity-master (PR to this branch for MonoBleedingEdge)](https://github.com/Unity-Technologies/mono/tree/unity-master)
+
+#### 2018.1
+* [unity-2018.1](https://github.com/Unity-Technologies/mono/tree/unity-2018.1)
+* [unity-2018.1-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2018.1-mbe)
+
+#### 2017.3
+* [unity-2017.3](https://github.com/Unity-Technologies/mono/tree/unity-2017.3)
+* [unity-2017.3-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.3-mbe)
+
+#### 2017.2
+* [unity-2017.2](https://github.com/Unity-Technologies/mono/tree/unity-2017.2)
+* [unity-2017.2-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.2-mbe)
+
+#### 2017.1
+* [unity-2017.1](https://github.com/Unity-Technologies/mono/tree/unity-2017.1)
+* [unity-2017.1-mbe](https://github.com/Unity-Technologies/mono/tree/unity-2017.1-mbe)
+
+#### 5.6
+* [unity-5.6](https://github.com/Unity-Technologies/mono/tree/unity-5.6)
+* [unity-5.6-mbe](https://github.com/Unity-Technologies/mono/tree/unity-5.6-mbe)
+
+
+
+
+Mono
+============================
+
 Mono is a software platform designed to allow developers to easily
 create cross platform applications.  It is an open source
 implementation of Microsoft's .NET Framework based on the ECMA

autogen.sh

@@ -148,6 +148,18 @@ automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
 echo "Running autoconf ..."
 autoconf || { echo "**Error**: autoconf failed."; exit 1; }
 
+# if test -d $srcdir/external/bdwgc/libatomic_ops; then
+#   echo Running external/bdwgc/libatomic_ops/autogen.sh ...
+#   (cd $srcdir/external/bdwgc/libatomic_ops ; ./autogen.sh)
+#   echo Done running external/bdwgc/libatomic_ops/autogen.sh ...
+# fi
+
+if test -d $srcdir/external/bdwgc; then
+  echo Running external/bdwgc/autogen.sh ...
+  (cd $srcdir/external/bdwgc ; ./autogen.sh)
+  echo Done running external/bdwgc/autogen.sh ...
+fi
+
 if test -d $srcdir/libgc; then
   echo Running libgc/autogen.sh ...
   (cd $srcdir/libgc ; NOCONFIGURE=1 ./autogen.sh "$@")

configure.ac

@@ -927,6 +927,8 @@ AC_ARG_WITH(xammac,              [  --with-xammac=yes,no                If you w
 AC_ARG_WITH(testing_aot_hybrid,  [  --with-testing_aot_hybrid=yes,no    If you want to build the testing_aot_hybrid assemblies (defaults to no)],   [], [with_testing_aot_hybrid=default])
 AC_ARG_WITH(testing_aot_full,    [  --with-testing_aot_full=yes,no      If you want to build the testing_aot_full assemblies (defaults to no)],     [], [with_testing_aot_full=default])
 AC_ARG_WITH(winaot,              [  --with-winaot=yes,no                If you want to build the Windows friendly AOT assemblies (defaults to no)], [], [with_winaot=default])
+AC_ARG_WITH(unityjit,            [  --with-unityjit=yes,no              If you want to build the Unity JIT friendly assemblies (defaults to no)],   [], [with_unityjit=default])
+AC_ARG_WITH(unityaot,            [  --with-unityaot=yes,no              If you want to build the Unity AOT friendly assemblies (defaults to no)],   [], [with_unityaot=default])
 AC_ARG_WITH(orbis,               [  --with-orbis=yes,no                 If you want to build the Orbis assemblies (defaults to no)], [], [with_orbis=default])
 AC_ARG_WITH(unreal,              [  --with-unreal=yes,no                If you want to build the Unreal assemblies (defaults to no)], [], [with_unreal=default])
 AC_ARG_WITH(wasm,                [  --with-wasm=yes,no                  If you want to build the WebAssembly (defaults to no)], [], [with_wasm=default])
@@ -949,12 +951,15 @@ with_xammac_default=no
 with_testing_aot_hybrid_default=no
 with_testing_aot_full_default=no
 with_winaot_default=no
+with_unityjit_default=no
+with_unityaot_default=no
 with_orbis_default=no
 with_unreal_default=no
 with_wasm_default=no
 
 with_bitcode_default=no
 with_cooperative_gc_default=no
+mono_feature_disable_com=yes
 
 INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=9000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000
 
@@ -972,6 +977,8 @@ elif test x$with_runtime_preset = xall; then
    with_monotouch_tv_default=yes
    with_xammac_default=yes
    with_winaot_default=yes
+   with_unityjit_default=yes
+   with_unityaot_default=yes
    with_orbis_default=yes
    with_unreal_default=yes
    with_wasm_default=yes
@@ -1034,6 +1041,25 @@ elif test x$with_runtime_preset = xwinaot; then
    AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
    AOT_RUN_FLAGS="--runtime=mobile --full-aot"
    AOT_MODE="llvmonly"
+elif test x$with_runtime_preset = xunityjit; then
+   DISABLE_MCS_DOCS_default=yes
+   with_unityjit_default=yes
+   TEST_PROFILE=unityjit
+
+   mono_feature_disable_remoting='yes'
+elif test x$with_runtime_preset = xunityaot; then
+   DISABLE_MCS_DOCS_default=yes
+   with_unityaot_default=yes
+   TEST_PROFILE=unityaot
+
+   #mono_feature_disable_com='yes'
+   mono_feature_disable_remoting='yes'
+   mono_feature_disable_reflection_emit_save='yes'
+   mono_feature_disable_reflection_emit='yes'
+   mono_feature_disable_appdomains='yes'
+
+   AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
+   AOT_RUN_FLAGS="--full-aot"
 elif test x$with_runtime_preset = xorbis; then
    DISABLE_MCS_DOCS_default=yes
    with_orbis_default=yes
@@ -1115,6 +1141,12 @@ fi
 if test "x$with_winaot" = "xdefault"; then
    with_winaot=$with_winaot_default
 fi
+if test "x$with_unityjit = "xdefault"; then
+   with_unityjit=$with_unityjit_default
+fi
+if test "x$with_unityaot = "xdefault"; then
+   with_unityaot=$with_unityaot_default
+fi
 if test "x$with_orbis" = "xdefault"; then
    with_orbis=$with_orbis_default
 fi
@@ -1136,6 +1168,8 @@ AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
 AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" != "xno"])
 AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"])
 AM_CONDITIONAL(INSTALL_WINAOT, [test "x$with_winaot" != "xno"])
+AM_CONDITIONAL(INSTALL_UNITYJIT, [test "x$with_unityjit" != "xno"])
+AM_CONDITIONAL(INSTALL_UNITYAOT, [test "x$with_unityaot" != "xno"])
 AM_CONDITIONAL(INSTALL_ORBIS, [test "x$with_orbis" != "xno"])
 AM_CONDITIONAL(INSTALL_UNREAL, [test "x$with_unreal" != "xno"])
 AM_CONDITIONAL(INSTALL_WASM, [test "x$with_wasm" != "xno"])
@@ -1161,6 +1195,12 @@ fi
 if test -z "$INSTALL_WINAOT_TRUE"; then :
    default_profile=winaot
 fi
+if test -z "$INSTALL_UNITYJIT_TRUE"; then :
+   default_profile=unityjit
+fi
+if test -z "$INSTALL_UNITYAOT_TRUE"; then :
+   default_profile=unityaot
+fi
 if test -z "$INSTALL_ORBIS_TRUE"; then :
    default_profile=orbis
 fi
@@ -1429,6 +1469,20 @@ AC_COMPILE_IFELSE([
    AC_MSG_RESULT(no)
 ])
 
+dnl BDWGC GC configuration
+dnl
+
+AC_ARG_ENABLE(bdwgc, [  --disable-bdwgc            Disable the Bdwgc GC.], upport_bdwgc=$enableval,support_bdwgc=${support_bdwgc:-yes})
+AM_CONDITIONAL(SUPPORT_BDWGC, test x$support_bdwgc = xyes)
+bdwgc_dir=external/bdwgc
+BDWGC_DEFINES='-DHAVE_BOEHM_GC -DHAVE_BDWGC_GC'
+LIBGCBDWGC_CPPFLAGS='-I$(top_srcdir)/external/bdwgc/include -I$(top_srcdir)/external/bdwgc/libatomic_ops/src'
+AC_SUBST(bdwgc_dir)
+AC_SUBST(BDWGC_DEFINES)
+AC_SUBST(LIBGCBDWGC_CPPFLAGS)
+
+dnl
+
 dnl
 dnl Boehm GC configuration
 dnl
@@ -1505,7 +1559,10 @@ if test "x$support_boehm" = "xyes"; then
 	AC_SUBST(LIBGC_STATIC_LIBS)
 	AC_SUBST(libgc_dir)
 	AC_SUBST(BOEHM_DEFINES)
-
+else
+	if test "x$support_bdwgc" = "xyes"; then
+		AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "External BDWGC (with typed GC)", [GC description])
+	fi
 fi
 AM_CONDITIONAL(SUPPORT_NULLGC, test "x$libgc" = "xnone")
 
@@ -4250,6 +4307,11 @@ case "x$libgc" in
 		if test "x$support_boehm" = "xyes"; then
 			AC_CONFIG_SUBDIRS(libgc)
 		fi
+		if test "x$support_bdwgc" = "xyes"; then
+			AC_CONFIG_SUBDIRS([external/bdwgc/libatomic_ops])
+			ac_configure_args="$ac_configure_args --enable-thread-local-alloc=no --enable-parallel-mark=no --enable-verify-defines=yes --enable-gc-threads=yes --with-libatomic-ops=no --enable-no-threads-discovery=yes --enable-single-obj-compilation=yes --enable-gcj-support=yes --enable-threads=$libgc_threads --enable-munmap=yes --enable-mmap=yes --enable-ignore-dynamic-loading=yes --enable-dont-register-main-static-data=yes"
+			AC_CONFIG_SUBDIRS([external/bdwgc])
+		fi
 		;;
 esac
 
@@ -4925,6 +4987,8 @@ echo "
 	Xamarin.TVOS:    $with_monotouch_tv
 	Xamarin.Mac:     $with_xammac
 	Windows AOT:     $with_winaot
+	Unity JIT:       $with_unityjit
+	Unity AOT:       $with_unityaot
 	Orbis:           $with_orbis
 	Unreal:          $with_unreal
 	WebAssembly:     $with_wasm

data/net_2_0/machine.config

@@ -118,6 +118,9 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
+		<settings>
+			<ipv6 enabled="true"/>
+		</settings>
 	</system.net>
 
 	<system.runtime.remoting>

data/net_4_0/machine.config

@@ -135,6 +135,9 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
+		<settings>
+			<ipv6 enabled="true"/>
+		</settings>
 	</system.net>
 
 	<system.runtime.remoting>

data/net_4_5/machine.config

@@ -138,6 +138,9 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
+		<settings>
+			<ipv6 enabled="true"/>
+		</settings>
 	</system.net>
 
 	<system.runtime.remoting>

external/buildscripts/add_to_build_results/monodistribution/bin/cli

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/cli.bat

@@ -0,0 +1,7 @@
+@echo off
+SETLOCAL
+set MONO_PREFIX=%~dp0..
+set MONO=%MONO_PREFIX%\bin\mono
+"%MONO%" %*
+exit /b %ERRORLEVEL%
+ENDLOCAL

external/buildscripts/add_to_build_results/monodistribution/bin/cli_x86

@@ -0,0 +1,4 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+arch -i386 $MONO "$@"

external/buildscripts/add_to_build_results/monodistribution/bin/ilasm

@@ -0,0 +1,3 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+exec $MONO $MONO_OPTIONS $MONO_PREFIX/lib/mono/4.5/ilasm.exe "$@"

external/buildscripts/add_to_build_results/monodistribution/bin/ilasm.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% "%~dp0..\lib\mono\4.5\ilasm.exe" %*
+exit /b %ERRORLEVEL%

external/buildscripts/add_to_build_results/monodistribution/bin/mcs

@@ -0,0 +1,3 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+exec $MONO $MONO_OPTIONS $MONO_PREFIX/lib/mono/4.5/mcs.exe "$@"

external/buildscripts/add_to_build_results/monodistribution/bin/mcs.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% "%~dp0..\lib\mono\4.5\mcs.exe" %*
+exit /b %ERRORLEVEL%

external/buildscripts/add_to_build_results/monodistribution/bin/mono-env

@@ -0,0 +1,7 @@
+. $(dirname $0)/monobin-env
+
+export MONO_PREFIX=$(dirname $0)/..
+MONO=$MONO_PREFIX/$MONOBINDIR/mono
+# remove //.. pattern as it causes problem on OSX High Sierra
+MONO=${MONO/\/\/\./\/\.}
+export LD_LIBRARY_PATH=$MONO_PREFIX/lib

external/buildscripts/add_to_build_results/monodistribution/bin/monobin-env

@@ -0,0 +1,14 @@
+MONOBINDIR=bin
+
+os=$(uname -a)
+variant=$(uname -m)
+
+case "$os" in
+    *GNU/Linux* )
+		if [ "$variant" = "x86_64" ]; then
+			MONOBINDIR=bin-linux64
+		else
+			MONOBINDIR=bin-linux32
+		fi
+    ;;
+esac

external/buildscripts/add_to_build_results/monodistribution/bin/monolinker

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO $MONO_PATH/monolinker.exe "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/monolinker.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% "%~dp0..\lib\mono\2.0\monolinker.exe" %*
+exit /b %ERRORLEVEL%

external/buildscripts/add_to_build_results/monodistribution/bin/nunit-console

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO --debug $MONO_PREFIX/lib/mono/4.0/nunit-console.exe "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/nunit-console.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% --debug "%~dp0..\lib\mono\4.0\nunit-console.exe" %*
+exit /b %ERRORLEVEL%

external/buildscripts/add_to_build_results/monodistribution/bin/nunit-console2

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO --debug $MONO_PREFIX/lib/mono/2.0/nunit-console.exe "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/resgen2

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO $MONO_PREFIX/lib/mono/4.5/resgen.exe "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/resgen2.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% "%~dp0..\lib\mono\4.5\resgen.exe" %*
+exit /b %ERRORLEVEL%

external/buildscripts/add_to_build_results/monodistribution/bin/xbuild

@@ -0,0 +1,5 @@
+#!/bin/bash
+. $(dirname $0)/mono-env
+
+$MONO $MONO_PREFIX/lib/mono/4.5/xbuild.exe "$@"
+

external/buildscripts/add_to_build_results/monodistribution/bin/xbuild.bat

@@ -0,0 +1,2 @@
+@"%~dp0cli.bat" %MONO_OPTIONS% "%~dp0..\lib\mono\4.5\xbuild.exe" %*
+exit /b %ERRORLEVEL%