Fix SAL annotations in CustomHeap::FillDebugBreak

Meghana Gupta · Meghana Gupta · commit 1ae0a329e421 · 2017-01-30T13:58:19.000-08:00
diff --git a/lib/Backend/InterpreterThunkEmitter.cpp b/lib/Backend/InterpreterThunkEmitter.cpp
@@ -686,7 +686,7 @@ void InterpreterThunkEmitter::EncodeInterpreterThunk(
 
 
 inline /*static*/
-DWORD InterpreterThunkEmitter::FillDebugBreak(_In_ BYTE* dest, _In_ DWORD count)
+DWORD InterpreterThunkEmitter::FillDebugBreak(_Out_writes_bytes_all_(count) BYTE* dest, _In_ DWORD count)
 {
 #if defined(_M_ARM)
     Assert(count % 2 == 0);
diff --git a/lib/Backend/InterpreterThunkEmitter.h b/lib/Backend/InterpreterThunkEmitter.h
@@ -113,7 +113,7 @@ class InterpreterThunkEmitter
 #endif
 
     /*-------static helpers ---------*/
-    inline static DWORD FillDebugBreak(_In_ BYTE* dest, _In_ DWORD count);
+    inline static DWORD FillDebugBreak(_Out_writes_bytes_all_(count) BYTE* dest, _In_ DWORD count);
     inline static DWORD CopyWithAlignment(_Out_writes_bytes_all_(sizeInBytes) BYTE* dest, _In_ const DWORD sizeInBytes, _In_reads_bytes_(srcSize) const BYTE* src, _In_ const DWORD srcSize, _In_ const DWORD alignment);
     template<class T>
     inline static void Emit(__in_bcount(sizeof(T) + offset) BYTE* dest, __in const DWORD offset, __in const T value)
diff --git a/lib/Common/Memory/CustomHeap.cpp b/lib/Common/Memory/CustomHeap.cpp
@@ -1108,7 +1108,7 @@ inline BucketId GetBucketForSize(size_t bytes)
 // Fills the specified buffer with "debug break" instruction encoding.
 // If there is any space left after that due to alignment, fill it with 0.
 // static
-void FillDebugBreak(_In_ BYTE* buffer, __in size_t byteCount)
+void FillDebugBreak(_Out_writes_bytes_all_(byteCount) BYTE* buffer, _In_ size_t byteCount)
 {
 #if defined(_M_ARM)
     // On ARM there is breakpoint instruction (BKPT) which is 0xBEii, where ii (immediate 8) can be any value, 0xBE in particular.
diff --git a/lib/Common/Memory/CustomHeap.h b/lib/Common/Memory/CustomHeap.h
@@ -572,6 +572,6 @@ typedef Heap<SectionAllocWrapper, PreReservedSectionAllocWrapper> OOPHeap;
 // Helpers
 unsigned int log2(size_t number);
 BucketId GetBucketForSize(DECLSPEC_GUARD_OVERFLOW size_t bytes);
-void FillDebugBreak(_In_ BYTE* buffer, __in size_t byteCount);
+void FillDebugBreak(_Out_writes_bytes_all_(byteCount) BYTE* buffer, _In_ size_t byteCount);
 } // namespace CustomHeap
 } // namespace Memory

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ void InterpreterThunkEmitter::EncodeInterpreterThunk(`
`686`	`686`
`687`	`687`
`688`	`688`	`inline /static/`
`689`		`-DWORD InterpreterThunkEmitter::FillDebugBreak(_In_ BYTE* dest, _In_ DWORD count)`
	`689`	`+DWORD InterpreterThunkEmitter::FillDebugBreak(_Out_writes_bytes_all_(count) BYTE* dest, _In_ DWORD count)`
`690`	`690`	`{`
`691`	`691`	`#if defined(_M_ARM)`
`692`	`692`	`Assert(count % 2 == 0);`
Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,7 @@ inline BucketId GetBucketForSize(size_t bytes)`
`1108`	`1108`	`// Fills the specified buffer with "debug break" instruction encoding.`
`1109`	`1109`	`// If there is any space left after that due to alignment, fill it with 0.`
`1110`	`1110`	`// static`
`1111`		`-void FillDebugBreak(_In_ BYTE* buffer, __in size_t byteCount)`
	`1111`	`+void FillDebugBreak(_Out_writes_bytes_all_(byteCount) BYTE* buffer, _In_ size_t byteCount)`
`1112`	`1112`	`{`
`1113`	`1113`	`#if defined(_M_ARM)`
`1114`	`1114`	`// On ARM there is breakpoint instruction (BKPT) which is 0xBEii, where ii (immediate 8) can be any value, 0xBE in particular.`