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/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.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/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.patch')
| -rw-r--r-- | packaging/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/packaging/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.patch b/packaging/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.patch new file mode 100644 index 0000000000..4b0513106a --- /dev/null +++ b/packaging/0016-Fix-copying-of-FieldMarshaler-structures-in-EEClassL.patch @@ -0,0 +1,42 @@ +From 1c2a01cd07c9893ea296794d4df542092759ed94 Mon Sep 17 00:00:00 2001 +From: Ruben Ayrapetyan <r.ayrapetyan@samsung.com> +Date: Fri, 7 Jul 2017 15:54:14 +0300 +Subject: [PATCH 16/32] Fix copying of FieldMarshaler structures in + EEClassLayoutInfo::CollectLayoutFieldMetadataThrowing. + +Related issue: #12643 +--- + src/vm/fieldmarshaler.cpp | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/vm/fieldmarshaler.cpp b/src/vm/fieldmarshaler.cpp +index 9415b94..0685093 100644 +--- a/src/vm/fieldmarshaler.cpp ++++ b/src/vm/fieldmarshaler.cpp +@@ -1606,11 +1606,19 @@ VOID EEClassLayoutInfo::CollectLayoutFieldMetadataThrowing( + { + CONSISTENCY_CHECK(fParentHasLayout); + PREFAST_ASSUME(pParentLayoutInfo != NULL); // See if (fParentHasLayout) branch above +- ++ + UINT numChildCTMFields = pEEClassLayoutInfoOut->m_numCTMFields - pParentLayoutInfo->m_numCTMFields; +- memcpyNoGCRefs( ((BYTE*)pEEClassLayoutInfoOut->GetFieldMarshalers()) + MAXFIELDMARSHALERSIZE*numChildCTMFields, +- pParentLayoutInfo->GetFieldMarshalers(), +- MAXFIELDMARSHALERSIZE * (pParentLayoutInfo->m_numCTMFields) ); ++ ++ BYTE *pParentCTMFieldSrcArray = (BYTE*)pParentLayoutInfo->GetFieldMarshalers(); ++ BYTE *pParentCTMFieldDestArray = ((BYTE*)pEEClassLayoutInfoOut->GetFieldMarshalers()) + MAXFIELDMARSHALERSIZE*numChildCTMFields; ++ ++ for (UINT parentCTMFieldIndex = 0; parentCTMFieldIndex < pParentLayoutInfo->m_numCTMFields; parentCTMFieldIndex++) ++ { ++ FieldMarshaler *pParentCTMFieldSrc = (FieldMarshaler *)(pParentCTMFieldSrcArray + MAXFIELDMARSHALERSIZE*parentCTMFieldIndex); ++ FieldMarshaler *pParentCTMFieldDest = (FieldMarshaler *)(pParentCTMFieldDestArray + MAXFIELDMARSHALERSIZE*parentCTMFieldIndex); ++ ++ pParentCTMFieldSrc->CopyTo(pParentCTMFieldDest, MAXFIELDMARSHALERSIZE); ++ } + } + + } +-- +2.7.4 + |