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

Unified Diff: syzygy/agent/asan/shadow_unittest.cc

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/runtime.cc ('k') | syzygy/agent/asan/unittest_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: syzygy/agent/asan/shadow_unittest.cc
diff --git a/syzygy/agent/asan/shadow_unittest.cc b/syzygy/agent/asan/shadow_unittest.cc
index a5b69879b3bedabe26c7416b5ccf5e989cbb0eae..a8f2851cf41df065372b7008f7ef9f542c48b9be 100644
--- a/syzygy/agent/asan/shadow_unittest.cc
+++ b/syzygy/agent/asan/shadow_unittest.cc
@@ -79,17 +79,12 @@ void ShadowUtilTest() {
// A derived class to expose protected members for unit-testing.
class TestShadow : public Shadow {
public:
- TestShadow() : Shadow(kDefaultTestShadowSize) {
- }
+ TestShadow() : Shadow() {}
TestShadow(size_t digits, size_t power)
: Shadow(digits << (power - kShadowRatioLog)) {
}
- // We'll simulate memory as being 1GB in size.
- static const size_t kDefaultTestShadowSize =
- (1 * 1024 * 1024 * 1024) >> kShadowRatioLog;
-
TestShadow(void* shadow, size_t length) : Shadow(shadow, length) {}
// Protected functions that we want to unittest directly.
@@ -409,8 +404,15 @@ TEST_F(ShadowTest, PoisonAllocatedBlock) {
kHeapRightPaddingMarker);
EXPECT_EQ(test_shadow.GetShadowMarkerForAddress(data + 6 * 8),
kHeapRightPaddingMarker);
+#ifndef _WIN64
EXPECT_EQ(test_shadow.GetShadowMarkerForAddress(data + 7 * 8),
kHeapBlockEndMarker);
+#else
+ EXPECT_EQ(test_shadow.GetShadowMarkerForAddress(data + 7 * 8),
+ kHeapRightPaddingMarker);
+ EXPECT_EQ(test_shadow.GetShadowMarkerForAddress(data + 8 * 8),
+ kHeapBlockEndMarker);
+#endif
uint8_t* cursor = info.RawHeader();
for (; cursor < info.RawBody(); ++cursor)
« no previous file with comments | « syzygy/agent/asan/runtime.cc ('k') | syzygy/agent/asan/unittest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698