Fix DAC layout in checked builds (dotnet#35542)

JimBobSquarePants · May 15, 2020 · 77a3832 · 77a3832
1 parent a5b5ec5
commit 77a3832
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/coreclr/src/inc/sstring.h b/src/coreclr/src/inc/sstring.h
@@ -809,6 +809,7 @@ template <COUNT_T MEMSIZE>
 class EMPTY_BASES_DECL InlineSString : public SString
 {
 private:
+    DAC_ALIGNAS(SString)
     BYTE m_inline[SBUFFER_PADDED_SIZE(MEMSIZE)];
 
 public:
@@ -991,6 +992,7 @@ template <COUNT_T MEMSIZE>
 class EMPTY_BASES_DECL ScratchBuffer : public SString::AbstractScratchBuffer
 {
   private:
+    DAC_ALIGNAS(::SString::AbstractScratchBuffer)
     BYTE m_inline[MEMSIZE];
 
   public:

diff --git a/src/coreclr/src/inc/utilcode.h b/src/coreclr/src/inc/utilcode.h
@@ -2573,6 +2573,7 @@ template <class MemMgr>
 class CHashTableAndData : public CHashTable
 {
 public:
+    DAC_ALIGNAS(CHashTable)
     ULONG      m_iFree;                // Index into m_pcEntries[] of next available slot
     ULONG      m_iEntries;             // size of m_pcEntries[]