Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Unified Diff: syzygy/agent/asan/block.h

Issue 2363733003: Make syzyasan_rtl compile in 64 bit (Closed)
Patch Set: Nits. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « syzygy/agent/asan/asan.gyp ('k') | syzygy/agent/asan/block.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: syzygy/agent/asan/block.h
diff --git a/syzygy/agent/asan/block.h b/syzygy/agent/asan/block.h
index 093c79e6672e0f990ec04710c83f6c5f1afef7da..b5e5637074ff368255ee169495993fb948b9f0fd 100644
--- a/syzygy/agent/asan/block.h
+++ b/syzygy/agent/asan/block.h
@@ -208,12 +208,22 @@ struct BlockTrailer {
// The time at which the block was freed (zero if not yet freed).
uint32_t free_ticks;
// The ID of the heap that allocated the block.
- uint32_t heap_id;
+ size_t heap_id;
+#ifdef _WIN64
+ // Add some padding so the trailer size will be a multiple of size
+ // (n + 1/2) * kShadowRatio.
+ // TODO(sebmarchand): Use this bytes to store more information.
+ uint32_t padding_;
+#endif
};
#pragma pack(pop)
static_assert((sizeof(BlockTrailer) % kShadowRatio) == (kShadowRatio / 2),
"Invalid BlockTrailer mod size.");
+#ifndef _WIN64
static_assert(sizeof(BlockTrailer) == 20, "Invalid BlockTrailer size.");
+#else
+static_assert(sizeof(BlockTrailer) == 28, "Invalid BlockTrailer size.");
+#endif
// A structure for recording the minimum pertinent information about a block.
// Can easily be expanded into a BlockInfo, but requires less space. This makes
« no previous file with comments | « syzygy/agent/asan/asan.gyp ('k') | syzygy/agent/asan/block.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698