Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[runtime] Implement support for conflict detection for Default Interface Methods. #6897

Merged
merged 1 commit into from Feb 10, 2018
Merged

[runtime] Implement support for conflict detection for Default Interface Methods. #6897

merged 1 commit into from Feb 10, 2018

Conversation

vargaz
Copy link
Contributor

@vargaz vargaz commented Feb 9, 2018

Detect conflicts caused by diamond inheritance during vtable construction, and throw an exception when a conflicting
methods is called.
Disable generic sharing for default interface methods, it doesn't work yet, probably
because these methods are called on classes, but the gshared information is associated with the interface.
Enable dim-diamondshape.exe test.

@vargaz
[runtime] Implement support for conflict detection for Default Interf…
aa774da 
…ace Methods.

Detect conflicts caused by diamond inheritance during vtable construction, and throw an exception when a conflicting
methods is called.
Disable generic sharing for default interface methods, it doesn't work yet, probably
because these methods are called on classes, but the gshared information is associated with the interface.
Enable dim-diamondshape.exe test.
@vargaz
Copy link
Contributor Author

vargaz commented Feb 9, 2018

@monojenkins build

@vargaz vargaz merged commit 5c4510a into mono:master Feb 10, 2018
@vargaz vargaz deleted the dim-diamond2 branch February 10, 2018 02:28
baulig pushed a commit to baulig/mono that referenced this pull request Feb 15, 2018
Merge with master.
66a0858 
Squashed commit of the following:

commit e01355e
Author: jaykrell <jay.krell@cornell.edu>
Date:   Thu Feb 15 13:12:27 2018 -0800

    [Cplusplus] Fix possible race condition and add casts between void* and function pointers. (mono#6871)

commit 9209ea0
Merge: cfa087b 1028994
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Thu Feb 15 14:53:50 2018 -0500

    Merge pull request mono#7073 from mono/disable-test-sleep

    Disable a flaky test on PRs (mono#6999)

commit cfa087b
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Thu Feb 15 14:12:13 2018 -0500

    [aot] Rename mono_aot_get_method_checked () to mono_aot_get_method (), there is no non-checked version anymore. (mono#7071)

commit e2419de
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Thu Feb 15 20:27:32 2018 +0200

    [interp] Add missing exception checkpoints (mono#6917)

    On interp we can't async abort since we cannot unwind from an ip in the interp, so the interpreter does explicit checks as part of branch instructions.

    Note this can lead to increased stack usage when compiling with -O0.

commit 1028994
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Thu Feb 15 12:29:38 2018 -0500

    Disable a flaky test on PRs (mono#6999)

commit cf64447
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Thu Feb 15 10:43:51 2018 -0500

    [msvc] Update csproj files (mono#7070)

commit 23e6f6f
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Thu Feb 15 10:43:30 2018 -0500

    Revert "[jit] Make some JIT regression test files compile in the mobile profile (mono#7059)" (mono#7069)

    This reverts commit e2874db.

    Revert this as it breaks the SDK tests.

commit b7385ba
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Thu Feb 15 10:07:37 2018 -0500

    [sdks] Add targets for the watch cross compiler. (mono#7061)

    * [offsets-tool] Add an '--output' argument to specify the output file directly instead of generating it from the target triple.

    * [sdks] Add targets for the watch cross compiler.

commit fc7bda6
Author: Jay Krell <jaykrell@microsoft.com>
Date:   Thu Jan 25 05:41:18 2018 -0800

    [coop] Convert some `mono_exception_*` functions
    Reduce managed exposure in utils a little.

    [coop] install object-forward.h

commit e2874db
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Thu Feb 15 09:07:44 2018 -0500

    [jit] Make some JIT regression test files compile in the mobile profile (mono#7059)

    Remove tests from Mono.Runtime.Tests which depend on assemblies not in the mobile profile.

commit ea1fac3
Author: jaykrell <jay.krell@cornell.edu>
Date:   Thu Feb 15 03:00:26 2018 -0800

    [coop] Remove unnecessary write barriers against thread locals and cleanup a little. (mono#6874)

    Restore scope for Centrinel, because the array macros
    are not expressions, so MONO_HANDLE_SUPPRESS does not work.

commit 3bd630e
Author: Miguel de Icaza <miguel@gnome.org>
Date:   Thu Feb 15 04:07:16 2018 -0500

    [mkbundle] Automatically bundle config files and machine.config files (mono#7002)

    * [mkbundle] Automatically bundle config files and machine.config files for the simple/cross compiler scenario, fixes one of the missing issues for mono#6230

commit b90d8ec
Author: jaykrell <jay.krell@cornell.edu>
Date:   Wed Feb 14 19:25:27 2018 -0800

    Remove GetNLSocket which is unused and produces a warning because it is unprototyped. (mono#6691)

commit 4a83009
Author: jaykrell <jay.krell@cornell.edu>
Date:   Wed Feb 14 16:11:27 2018 -0800

    WSL does not nul terminate uname.release. memset(0) it first. (mono#7023)

commit 8d82699
Merge: 62bf8bd 2322177
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed Feb 14 19:09:23 2018 -0500

    Merge pull request mono#7057 from lewurm/interp-disable-flaky-pinvoke-test

    [interp] disable flaky pinvoke test

commit 62bf8bd
Author: Marek Safar <marek.safar@gmail.com>
Date:   Thu Feb 15 00:55:45 2018 +0100

    [System.ServiceModel.Activation] Move ServiceHostFactory.cs where it's used (mono#7044)

commit 2322177
Author: Bernhard Urban <lewurm@gmail.com>
Date:   Thu Feb 15 00:51:24 2018 +0100

    [interp] disable flaky pinvoke test

commit 8ad191d
Author: jaykrell <jay.krell@cornell.edu>
Date:   Wed Feb 14 14:59:26 2018 -0800

    mono_get_exception_runtime_wrapped_checked contains an unnecessary 16 (mono#6659)

    element array that can be just 1 element, or completely absent.
    It is a rare path, but stack use should always be minimized.

commit 20e69fa
Author: jaykrell <jay.krell@cornell.edu>
Date:   Wed Feb 14 14:56:09 2018 -0800

    Centralize post-object creation code in mono_object_new_common_tail. (mono#6903)

    This resolves inconsistency around support of weak fields (bug?)
    and is smaller and easier to maintain.

commit a33cbb8
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Wed Feb 14 23:09:59 2018 +0200

    [interp] Fix native to interp transition (mono#6868)

    When using the interp_wrapper to enter interp from native we don't need to save the lmf since it doesn't make sense to unwind to native. Also make sure we have the interp context set up if we weren't attached at interp transition time.

commit 7cac757
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Tue Feb 13 16:02:29 2018 -0500

    [aot] Emit the weak field indexes table using the MONO_AOT_TABLE code, so it works with separate aot data files/bitcode.

    Fixes mono#6948.

commit 8c90350
Author: Ankit Jain <radical@gmail.com>
Date:   Fri Feb 9 16:20:46 2018 -0500

    Add denied assembly versions from previous ms extensions nugets

    Extracted from Microsoft.NET.Build.Extensions

    	2.1.0-preview1-62414-02   # https://github.com/dotnet/cli/blob/501e11d928c21608999c934f0a7078570b688c6c/build/DependencyVersions.props
    	15.5.0-preview-20171027-2 # https://github.com/dotnet/cli/blob/ed916bb13e798a470855fb4f60acd3cabb2765fc/build/DependencyVersions.props
    	2.0.0-preview3-20170622-1 # https://github.com/dotnet/cli/blob/7c928a9f18f81001e586e5bf0411f9bfa92e30d4/build/DependencyVersions.props

    And also remove incorrect entries from earlier version
    2.1.0-preview1-62516-03 , which were not committed to mono's msbuild.

    A future commit will sort and de-dedup the lists, but this one avoids
    removing any existing duplicates, to make review easier.

commit 47187bb
Author: Miguel de Icaza <miguel@gnome.org>
Date:   Tue Feb 13 21:48:53 2018 -0500

    [Mono.Posix] .NET Core compatibility - Use [In,Out] for arrays of structures

    While Mono does copy the values of arrays back when they are marshaled
    to unmanaged code, .NET does not seem to be doing this, and manifests
    as the Syscall.poll invocation in Mono.Posix with .NET Core does not update
    the values in the provided array.

    The following example should print "Got 1 and 1" with the following command:

    ```
    echo foo | dotnet run
    ```

    But instead prints 0 and 1 on .NET Core, but the correct result with Mono.

    This patch is going here for the sake of the Mono.Posix.NetCore package that
    we publish.

    Sample:

    ```
    using System;
    using System.Runtime.InteropServices;

    class X {
            private struct _pollfd {
                    public int fd;
                    public short events;
                    public short revents;
            }

            [DllImport("libc")]
            static extern int poll ([In,Out]_pollfd[] ufds, uint nfds, int timeout);

            static void Main ()
            {
                    var p2 = new _pollfd [1] { new _pollfd () { fd = 0, events = 1 } };
                    var m = poll (p2, 1, -1);

                    Console.WriteLine ("Got: {0} and {1}", n, pollmap [0].revents);
                    Console.ReadLine ();
            }
    }
    ```

commit 57f3f34
Author: Ludovic Henry <luhenry@microsoft.com>
Date:   Wed Feb 14 12:03:23 2018 -0500

    Revert "[coop] Remove support for invoke thunk wrapper" (mono#6927)

    We still want to be able to invoke thunk wrappers. The transition to MonoHandle will be a separate change.

    This reverts commit 150d896.

commit 8d19e5a
Author: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date:   Wed Feb 14 11:58:15 2018 -0500

    [runtime] Unboxing of nullable enums should throw for boxed ints. (mono#6958)

    * [runtime] Unboxing of nullable enums should throw for boxed ints. Fixes gh mono#6666.

    For some reason, one can't unbox the underlying type of an enum into a nullable.

    This is counter intuitive to the unboxing rules of enums, but it's what dotnet does.

    * [interp] Unboxing of nullable enmus should throw for boxed ints

    fixes mono#6666 for the interpreter

commit 8f35227
Author: Bernhard Urban <lewurm@gmail.com>
Date:   Wed Feb 14 13:04:13 2018 +0100

    [debugger] disable StepOutAsync test because it's flaky

commit 545191f
Author: Ludovic Henry <ludovic@xamarin.com>
Date:   Mon Feb 12 18:22:03 2018 -0500

    Pass null-terminated string for logging

commit 2c1f45f
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed Feb 14 05:35:11 2018 +0100

    [TermInfo] support new file format terminfo2 introduced with ncurses6.1 (mono#6960)

    See also mirror/ncurses@1501ae2#diff-2c0786db969084ba9e087d82f8275e0b

    Fixes mono#6752

commit 3012ce0
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Wed Feb 14 01:31:23 2018 +0000

    Update F# to 4.1.33

    Next update to F# to include regression fix dotnet/fsharp#4348

commit ff98989
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Tue Feb 13 19:42:37 2018 -0500

    [runtime] Avoid recreating the icall table in lookup_icall_symbol (). (mono#6988)

commit 17b4b28
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Tue Feb 13 18:04:49 2018 -0500

    [sdk] Fix the invocation of run-step.sh, the --timeout argument is mandatory. (mono#7013)

commit 3fdbbe5
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Tue Feb 13 17:01:41 2018 -0500

    [sdks] Fix the tar command since the llvm binaries are in different directories now. (mono#7010)

commit c9c7dad
Author: Bernhard Urban <lewurm@gmail.com>
Date:   Tue Feb 13 00:23:13 2018 +0100

    Bump mono/NUnitLite

    Commit list for mono/NUnitLite:

    * mono/NUnitLite@0dc7716 [FinallyDelegate] make key for `lookupTable` actually unique (mono#6)

    Diff: mono/NUnitLite@a8bef89...0dc7716

commit 96f2d16
Merge: e52ef6a 0354912
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Tue Feb 13 13:37:20 2018 -0500

    Merge pull request mono#6970 from dsyme/patch-1

    Bump F# mono version to 4.1.32

commit e52ef6a
Author: Marek Safar <marek.safar@gmail.com>
Date:   Tue Feb 13 19:33:04 2018 +0100

    [build] Fixes monolite build (mono#6982)

commit 36cbab6
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Tue Feb 13 15:48:28 2018 +0000

    [msvc] Update csproj files

commit f61bc39
Author: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date:   Tue Feb 13 10:24:00 2018 -0500

    Simplify MonoError and managed Exception creation (mono#6123)

    MonoError is simplified for MME by having the error message eagerly created, which simplifies things A LOT.
    Managed Exception creation is simplified by only setting Message, as it's done by other runtimes.

    * [mini] Fix mini_emit_memory_copy_internal with ref types and remove workaround from mono_method_to_ir

    * [mini] Remove unused argument and rename function to better reflect its use.

    * [utils] Fix swapped member and signature fields in error message.

    * [runtime] Simplify MME by only setting the message field since ClassName/MemberName don't need to be set.

    * [runtime] Add mono_error_set_method_missing to exceptions.c and collapse setting MME to a single function.

    This implements the cleanup discussed in the PR.

    * [runtime] Cleanup MonoError for BadImageFormatException.

    Move mono_error_set_bad_image & mono_error_set_bad_image_name to exception.c.
    Rename mono_error_set_bad_image_name to mono_error_set_bad_image_by_name.

    Introduce mono_corlib_exception_new_with_args to be used when creating exception objects.
    It's easier to consume than mono_exception_from_name_two_strings_checked as it takes string arguments as char*.

    Fix usage of mono_error_set_bad_image_by_name to never dup the supplied image name as the callee does it.
    Fix some empty error messages.

    Finally, reduce the cruft in mono_error_prepare_exception by using the new exception creation function from above.

    * [runtime] Cleanup MonoError of FileNotFoundException.

    Move it to use the generic first_argument and make it a simple error - IE, get_message doesn't format anything.

    * [runtime] Rework MonoError for MissingFieldException.

    * Fix build issues

    * [runtime] Ensure memory is freed using new MonoError set functions.

commit 60d4907
Author: Alexander Kyte <alexmkyte@gmail.com>
Date:   Tue Feb 13 09:59:53 2018 -0500

    [runtime] Revert mkbundle defaulting behavior made in ca8b8bd (mono#6687)

    Fixes mono#6187

commit d8d3e29
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Tue Feb 13 15:14:58 2018 +0100

    Bump api-snapshot

commit 0354912
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Tue Feb 13 13:41:31 2018 +0000

    Bump F# mono version to 4.1.32

    This version contains a fix to fsharpi to make no-gui the default again

commit d573dec
Author: Radek Doulik <rodo@xamarin.com>
Date:   Mon Feb 12 21:56:11 2018 +0100

    Bump linker and update linker-analyzer references

commit d6e7483
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Fri Feb 9 20:13:44 2018 +0200

    [interp] Fix CEE_UNBOX

    When unboxing nullable we call Nullable.Unbox which returns the valuetype, but CEE_UNBOX needs to return an address to it. Therefore we store the result in a local in the frame so we can get its address.

commit 7a528f6
Author: Aleksey Kliger (λgeek) <akliger@gmail.com>
Date:   Mon Feb 12 20:48:27 2018 -0500

    [sre] Unlock loader lock on error paths (mono#6951)

commit e572acc
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Tue Feb 13 02:00:13 2018 +0100

    [ci] Only create artifacts.json GitHub status on release branches

commit 939d720
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Tue Feb 13 01:51:12 2018 +0100

    [ci] Disable monodoc tests on Windows for now

    They fail: mono#6956

commit ea7b384
Author: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date:   Mon Feb 12 18:22:06 2018 -0500

    Cleanup recent JIT fix to get it done in the right place. (mono#6895)

    * [mini] Fix mini_emit_memory_copy_internal with ref types and remove workaround from mono_method_to_ir

    * [mini] Remove unused argument and rename function to better reflect its use.

commit 29d402d
Author: jaykrell <jay.krell@cornell.edu>
Date:   Mon Feb 12 15:15:34 2018 -0800

    [handle] Have `MONO_HANDLE_*` macros use a uintptr_t instead of int (mono#6906)

commit 25c41cb
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Mon Feb 12 17:36:27 2018 -0500

    Fix gshared support for default interface methods by always passing an mrgctx to them. (mono#6935)

    * Fix gshared support for default interface methods by always passing an mrgctx to them.

    This is needed because these methods can be part of more than one inheritance hierarchy or
    be present more than once in the same inheritance hierarchy so its not possible to
    assign rgxtx slots to their gshared entries that would work in all cases.

    * [jit] Add a mini_method_is_default_method () helper function.

commit 1c63142
Merge: dcecd8f 6a5a14b
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Mon Feb 12 13:16:29 2018 -0500

    Merge pull request mono#6929 from mono/disable-test-TaskCancelWait1

    [System.Threading.Tasks] Disable a flaky test (corefx bump)

commit dcecd8f
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Mon Feb 12 13:02:49 2018 -0500

    Disable flaky test

    (mono#6947)

commit b97d0c4
Author: Martin Baulig <martin.baulig@xamarin.com>
Date:   Fri Feb 9 18:58:09 2018 -0500

    [System]: WebConnection.Connect() needs to probe all IP addresses.

    Fix a regression introduced in the new web stack - when connecting
    to a DNS host name that resolves to multiple IP addresses, we need
    to probe them all.

    On iOS, "localhost" will resolve to both "::1" and "127.0.0.1".

commit e43adf3
Author: jaykrell <jay.krell@cornell.edu>
Date:   Sun Feb 11 22:29:11 2018 -0800

    Change mono_thread_resume_interruption to return void, one less raw pointer to worry about. (mono#6690)

commit c944c35
Author: jaykrell <jay.krell@cornell.edu>
Date:   Sun Feb 11 20:15:25 2018 -0800

    [scripts] Fix scripts/update_submodules.sh for use with git worktree

commit 7f9167b
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Sun Feb 11 18:32:55 2018 -0500

    [runtime] Fix the --enable-icall-symbol-map build. (mono#6943)

commit 921132a
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Sun Feb 11 10:43:07 2018 -0500

    [runtime] Make icall tables loadable. (mono#6905)

    * [runtime] Make icall tables loadable.

    Move the icall table code into a separate icall-table.c file, which is either linked into libmono or compiled into a
    separate libmono-icall-table.a archive which can be linked into an app, and installed by calling mono_icall_table_init ().

    * Change ClCompile to ClInclude for new .h file.

commit d8beb3e
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Sat Feb 10 21:57:52 2018 +0100

    [profiler] Remove obsolete code coverage support from the log profiler. (mono#6896)

commit 48898cb
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Sat Feb 10 10:47:47 2018 -0500

    [sdks] Fix ios+llvm. (mono#6939)

commit 7f47f19
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Sat Feb 10 10:23:50 2018 -0500

    [runtime] Fix a warning. (mono#6937)

commit b970e76
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Tue Feb 6 01:21:29 2018 +0200

    [interp] Add class failure checks

commit 52ebab8
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Wed Feb 7 19:56:51 2018 +0000

    [interp] Fix varargs passing

    We must not push one vararg at a time since the alignment of the argument is not the same as the alignment of a value type in interp (which is always 8)

commit 3369b6e
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Wed Feb 7 19:55:33 2018 +0000

    [interp] Align vt stack in some places

commit 6ffa48f
Author: Vlad Brezae <brezaevlad@gmail.com>
Date:   Wed Feb 7 19:38:02 2018 +0000

    [interp] Add define for value type alignment

commit 9f2b859
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Sat Feb 10 02:14:04 2018 -0500

    [jit] Fix the DISABLE_JIT build. (mono#6933)

commit 5c4510a
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Fri Feb 9 21:28:19 2018 -0500

    [runtime] Implement support for conflict detection for Default Interface Methods. (mono#6897)

    Detect conflicts caused by diamond inheritance during vtable construction, and throw an exception when a conflicting
    methods is called.
    Disable generic sharing for default interface methods, it doesn't work yet, probably
    because these methods are called on classes, but the gshared information is associated with the interface.
    Enable dim-diamondshape.exe test.

commit 284c5af
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Fri Feb 9 19:15:32 2018 -0500

    Bug 60088 - Assertion at ../../../../external/mono/mono/mini/debugger-agent.c:4765, condition `array->len == 1' not met (mono#6902)

    Problem was that I didn't consider `async void` method when adding that assert

commit 6a5a14b
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Fri Feb 9 17:48:19 2018 -0500

    [System.Threading.Tasks] Disable a flaky test

commit dcda4c7
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Fri Feb 9 15:33:58 2018 -0500

    Disable some PngCodecTest that have trouble on CI right now

commit 5e7483f
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Fri Feb 9 21:22:16 2018 +0100

    [System.Drawing] Disable tests except on ARM64 (mono#6909)

    See mono#6908

commit dd5b5ca
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Fri Feb 9 15:21:52 2018 -0500

    Set NetworkStream.ReadTimeout in WebConnection.InitConnection(). (mono#6904)

    Setting ReadTimeout in WebResponseStream.ctor throws System.Net.Sockets.SocketException : Invalid arguments on iOS.

    Set it in WebConnection.InitConnection() immediately after establishing a connection, before we read/write anything.

commit 2a3b081
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Fri Feb 9 12:52:26 2018 -0500

    [jit] Simplify some gshared code. (mono#6899)

    * [jit] Simplify some gshared code by calling mini_method_get_rgctx () in more places, make mono_method_lookup_rgctx () static. NFC.

    * [jit] Get rid of the 'method' argument to emit_get_rgctx (), it should always be equal to cfg->method. NFC.

commit 2a3c498
Author: Bernhard Urban <lewurm@gmail.com>
Date:   Thu Feb 8 22:19:56 2018 +0100

    [interp] disable test_42_arm64_dyncall_vtypebyval

    regression test introduced by mono#6826
    fails on ARM64 with interp

commit 43617b0
Author: Ankit Jain <radical@gmail.com>
Date:   Wed Feb 7 01:54:20 2018 -0500

    nuget-hash-extractor: Add msbuild extensions nuget to list of nugets to

    .. process. Version from:

    https://github.com/dotnet/cli/blob/501e11d928c21608999c934f0a7078570b688c6c/build/DependencyVersions.props

    ```
        <MicrosoftNETSdkPackageVersion>2.1.0-preview1-62414-02</MicrosoftNETSdkPackageVersion>
        <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    ```

    Also, update the list in the runtime and deniedAssembliesList.txt
    installed for use by msbuild.

commit 4cb7884
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Jan 30 18:08:25 2018 -0500

    nuget-hash-extractor: Add support for handling nuget with multiple

    .. assemblies.

    This is specifically required for handling .net assemblies in
    `Microsoft.NET.Build.Extensions` nuget which don't work on mono. These
    assemblies are bundled with msbuild and we want to be able to deny these
    at runtime.

commit d2998f5
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Fri Feb 9 15:30:56 2018 +0000

    [msvc] Update csproj files

commit 71ad99f
Author: Marek Safar <marek.safar@gmail.com>
Date:   Mon Feb 5 09:51:40 2018 -0500

    [build] Narrow recursive dependencies

commit b3d6025
Author: Marek Safar <marek.safar@gmail.com>
Date:   Sun Feb 4 19:06:35 2018 -0500

    [Mono.Security] Remove unused using

commit 06b836e
Author: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date:   Thu Feb 8 17:27:17 2018 -0800

    [wasm] Make v8 build verbose and fix zip package root. (mono#6900)

commit 06a89a5
Author: Tychshenko, Dmitriy <Dmitriy_Tychshenko@intuit.com>
Date:   Tue Jan 23 09:39:19 2018 -0500

    Adjust tabbing.

commit b2ec39d
Author: Tychshenko, Dmitriy <Dmitriy_Tychshenko@intuit.com>
Date:   Tue Jan 23 09:34:48 2018 -0500

    Add ordinal comparison when matching request path to listener paths

commit 8917ddf
Author: Tychshenko, Dmitriy <Dmitriy_Tychshenko@intuit.com>
Date:   Mon Jan 22 14:52:13 2018 -0500

    Fixes WCF methods with path parameters in UriTemplate annotation. Bugzilla bug #25444 [https://bugzilla.xamarin.com/show_bug.cgi?id=25444]

commit f3b1c9b
Author: Tychshenko, Dmitriy <Dmitriy_Tychshenko@intuit.com>
Date:   Wed Jan 17 16:38:49 2018 -0500

    Pick the Listener that matches the start of the request URL

commit c84e6c8
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Thu Feb 8 22:22:37 2018 +0100

    [bcl] Fix more assembly identity mismatches (mono#6870)

    As a follow up to mono#6848 I checked
    all the assemblies and found some more identity mismatches with .NET

commit 9adf4bd
Author: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date:   Thu Feb 8 13:08:17 2018 -0800

    [wasm] Add system test suite exclude file. (mono#6847)

commit b6784b2
Author: Ludovic Henry <luhenry@microsoft.com>
Date:   Thu Feb 8 14:36:07 2018 -0500

    [sdks] Fix build for iOS (mono#6878)

commit 3f61f9f
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Thu Feb 8 20:32:17 2018 +0100

    configure.ac: Only use library path in libgdiplus_loc

    We use the value defined there to insert into `config` file in
    runtime/Makefile.am and this would get the "preinstalled at" string.

commit af03c6a
Author: jaykrell <jay.krell@cornell.edu>
Date:   Thu Feb 8 11:02:45 2018 -0800

    Detect libgdiplus in configure.ac by default on MacOSX (darwin). (mono#6873)

commit b3eabd5
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Thu Feb 8 19:32:57 2018 +0100

    Bump bockbuild
joncham pushed a commit to Unity-Technologies/mono that referenced this pull request Apr 6, 2018
@vargaz @joncham
[runtime] Implement support for conflict detection for Default Interf…
9c7dde9 
…ace Methods. (mono#6897)

Detect conflicts caused by diamond inheritance during vtable construction, and throw an exception when a conflicting
methods is called.
Disable generic sharing for default interface methods, it doesn't work yet, probably
because these methods are called on classes, but the gshared information is associated with the interface.
Enable dim-diamondshape.exe test.
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
@vargaz
[runtime] Implement support for conflict detection for Default Interf…
3cc6fbf 
…ace Methods. (mono/mono#6897)

Detect conflicts caused by diamond inheritance during vtable construction, and throw an exception when a conflicting
methods is called.
Disable generic sharing for default interface methods, it doesn't work yet, probably
because these methods are called on classes, but the gshared information is associated with the interface.
Enable dim-diamondshape.exe test.

Commit migrated from mono/mono@5c4510a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kumpera kumpera Awaiting requested review from kumpera

@luhenry luhenry Awaiting requested review from luhenry

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@vargaz