diff options
| author | Konstantin Baladurin <k.baladurin@partner.samsung.com> | 2018-04-26 17:34:58 +0300 |
|---|---|---|
| committer | Vladislav Andresov <v.andresov@partner.samsung.com> | 2018-04-26 20:04:15 +0300 |
| commit | 371df401e4d8c9639035d164710d1246e0cb8548 (patch) | |
| tree | b550f3433a68c80a1ff952413b7b7a0e3ab97995 /packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch | |
| parent | 5e7a310b1a251937154d05cd52637ac62b6d5edc (diff) | |
| download | coreclr-accepted/tizen_4.0_unified.tar.gz coreclr-accepted/tizen_4.0_unified.tar.bz2 coreclr-accepted/tizen_4.0_unified.zip | |
Add memory optimization patches from upstreamsubmit/tizen_4.0/20180427.011218accepted/tizen/4.0/unified/20180427.062437accepted/tizen_4.0_unified
Change-Id: Ie8ea75fa60184b77135289c8fdc0f49d40b49d87
Diffstat (limited to 'packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch')
| -rw-r--r-- | packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch b/packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch new file mode 100644 index 0000000000..4aae433b92 --- /dev/null +++ b/packaging/0011-FIX-fix-No.2-incorrect-m_pBeginInvokeMethod.patch @@ -0,0 +1,25 @@ +From 39faf6a5a0c6217aaed0dbccec40f5b43eb10529 Mon Sep 17 00:00:00 2001 +From: Gleb Balykov <g.balykov@samsung.com> +Date: Wed, 11 Apr 2018 16:34:59 +0300 +Subject: [PATCH 11/32] FIX: fix No.2, incorrect m_pBeginInvokeMethod + +--- + src/vm/methodtablebuilder.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp +index 05ab438..a1e9095 100644 +--- a/src/vm/methodtablebuilder.cpp ++++ b/src/vm/methodtablebuilder.cpp +@@ -5037,7 +5037,7 @@ void MethodTableBuilder::SetSecurityFlagsOnMethod(bmtRTMethod* pParentMethod, + if(!pNewMD->RequiresLinktimeCheck() && IsDelegate()) + { + DelegateEEClass* pDelegateClass = (DelegateEEClass*)GetHalfBakedClass(); +- if(pNewMD == pDelegateClass->m_pBeginInvokeMethod) ++ if(pNewMD == pDelegateClass->m_pBeginInvokeMethod.GetValueMaybeNull()) + { + pNewMD->SetRequiresLinktimeCheck(); + pNewMD->SetRequiresLinkTimeCheckHostProtectionOnly(); // this link check is due to HP only +-- +2.7.4 + |