Merge pull request dotnet#21287 from hoyosjs/fix-tls-daccast

hoyosjs · web-flow · commit a22f526040ce · 2018-11-29T18:19:08.000-08:00
Properly DACize TLB access for thread local statics
diff --git a/src/vm/threadstatics.h b/src/vm/threadstatics.h
@@ -533,7 +533,7 @@ class ThreadStatics
     {
         SUPPORTS_DAC;
 
-        return dac_cast<PTR_ThreadLocalBlock>(&pThread->m_ThreadLocalBlock);
+        return dac_cast<PTR_ThreadLocalBlock>(PTR_TO_MEMBER_TADDR(Thread, pThread, m_ThreadLocalBlock));
     }
 
 #ifndef DACCESS_COMPILE

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ class ThreadStatics`
`533`	`533`	`{`
`534`	`534`	`SUPPORTS_DAC;`
`535`	`535`
`536`		`- return dac_cast<PTR_ThreadLocalBlock>(&pThread->m_ThreadLocalBlock);`
	`536`	`+ return dac_cast<PTR_ThreadLocalBlock>(PTR_TO_MEMBER_TADDR(Thread, pThread, m_ThreadLocalBlock));`
`537`	`537`	`}`
`538`	`538`
`539`	`539`	`#ifndef DACCESS_COMPILE`