From: Brian Sullivan Date: Mon, 3 Apr 2017 23:01:23 +0000 (-0700) Subject: Remove the SO_TOLERANT contact from CEEInfo::resolveVirtualMethodHelper X-Git-Tag: submit/tizen/20210909.063632~11030^2~7439^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=731d2772b2058854eb67692e55805b75986720a1;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Remove the SO_TOLERANT contact from CEEInfo::resolveVirtualMethodHelper that contract should only apply to CEEInfo::resolveVirtualMethod which uses the JIT_TO_EE_TRANSITION() transition macros. Commit migrated from https://github.com/dotnet/coreclr/commit/b58c5b24f1a616a58f70fc026fe22a8ca0d6b438 --- diff --git a/src/coreclr/src/vm/jitinterface.cpp b/src/coreclr/src/vm/jitinterface.cpp index 248deac..ab9075c 100644 --- a/src/coreclr/src/vm/jitinterface.cpp +++ b/src/coreclr/src/vm/jitinterface.cpp @@ -8719,7 +8719,6 @@ CORINFO_METHOD_HANDLE CEEInfo::resolveVirtualMethodHelper(CORINFO_METHOD_HANDLE CORINFO_CONTEXT_HANDLE ownerType) { CONTRACTL { - SO_TOLERANT; THROWS; GC_TRIGGERS; MODE_PREEMPTIVE;