Make syzyasan_rtl compile in 64 bit

syzygy/agent/asan/error_info_unittest.cc

 // Copyright 2014 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 298 matching lines @@
   AsanBlockInfo block_info = {};
   InitAsanBlockInfo(&block_info);
 
   {
     crashdata::Value info;
     PopulateBlockInfo(runtime_->shadow(), block_info, false, &info, nullptr);
     std::string json;
     EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
     const char kExpected[] =
         "{\n"
+#ifndef _WIN64
         "  \"header\": \"0x%08X\",\n"
+#else
+        "  \"header\": \"0x%08llX\",\n"
+#endif
         "  \"user-size\": 8,\n"
         "  \"state\": \"allocated\",\n"
         "  \"heap-type\": \"WinHeap\",\n"
         "  \"analysis\": {\n"
         "    \"block\": \"corrupt\",\n"
         "    \"header\": \"corrupt\",\n"
         "    \"body\": \"(unknown)\",\n"
         "    \"trailer\": \"clean\"\n"
         "  },\n"
         "  \"alloc-thread-id\": 47,\n"
@@ skipping 15 matching lines @@
     block_info.free_stack_size = 3;
     block_info.heap_type = kWinHeap;
     block_info.milliseconds_since_free = 100;
 
     crashdata::Value value;
     PopulateBlockInfo(runtime_->shadow(), block_info, true, &value, nullptr);
     std::string json;
     EXPECT_TRUE(crashdata::ToJson(true, &value, &json));
     const char kExpected[] =
         "{\n"
+#ifndef _WIN64
         "  \"header\": \"0x%08X\",\n"
+#else
+        "  \"header\": \"0x%08llX\",\n"
+#endif
         "  \"user-size\": 8,\n"
         "  \"state\": \"quarantined (flooded)\",\n"
         "  \"heap-type\": \"WinHeap\",\n"
         "  \"analysis\": {\n"
         "    \"block\": \"corrupt\",\n"
         "    \"header\": \"corrupt\",\n"
         "    \"body\": \"(unknown)\",\n"
         "    \"trailer\": \"clean\"\n"
         "  },\n"
         "  \"alloc-thread-id\": 47,\n"
         "  \"alloc-stack\": [\n"
         "    \"0x00000001\", \"0x00000002\"\n"
         "  ],\n"
         "  \"free-thread-id\": 32,\n"
         "  \"free-stack\": [\n"
         "    \"0x00000003\", \"0x00000004\", \"0x00000005\"\n"
         "  ],\n"
         "  \"milliseconds-since-free\": 100,\n"
         "  \"contents\": {\n"
         "    \"type\": \"blob\",\n"
+#ifndef _WIN64
         "    \"address\": \"0x%08X\",\n"
+#else
+        "    \"address\": \"0x%08llX\",\n"
+#endif
         "    \"size\": null,\n"
         "    \"data\": [\n"
         "      \"0x80\", \"0xCA\", \"0x00\", \"0x00\", \"0x20\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
         "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
         "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
 #ifdef _WIN64
         "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
 #endif
         "      \"0xC3\", \"0xC3\", \"0xC3\", \"0xC3\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
+#ifdef _WIN64
+        "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
+        " \"0x00\", \"0x00\",\n"
+#endif
         "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\",\n"
         "      \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
         " \"0x00\", \"0x00\"\n"
         "    ]\n"
         "  },\n"
         "  \"shadow\": {\n"
         "    \"type\": \"blob\",\n"
-        "    \"address\": \"0x%08zX\",\n"

[Ignat Loskutov, 2016/09/22 22:00:36]

What's wrong about %08zX?

+#ifndef _WIN64
+        "    \"address\": \"0x%08X\",\n"
+#else
+        "    \"address\": \"0x%08llX\",\n"
+#endif
         "    \"size\": null,\n"
         "    \"data\": [\n"
 #ifndef _WIN64
         "      \"0xE0\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\", \"0xF4\"\n"
 #else
         "      \"0xE0\", \"0xFA\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\","
-        " \"0xF4\"\n"
+        " \"0xFB\", \"0xF4\"\n"
 #endif
         "    ]\n"
         "  }\n"
         "}";
     std::string expected = base::StringPrintf(
         kExpected,
         block_info.header,
         block_info.header,
         BlockShadowAddress());
     EXPECT_EQ(expected, json);
   }
 }
 
 TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
   AsanBlockInfo block_info = {};
   InitAsanBlockInfo(&block_info);
 
   {
     crashdata::Value info;
     PopulateBlockInfo(runtime_->shadow(), block_info, false, &info, nullptr);
     std::string json;
     EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
     const char kExpected[] =
         "{\n"
+#ifndef _WIN64
         "  \"header\": \"0x%08X\",\n"
+#else
+        "  \"header\": \"0x%08llX\",\n"
+#endif
         "  \"user-size\": 8,\n"
         "  \"state\": \"allocated\",\n"
         "  \"heap-type\": \"WinHeap\",\n"
         "  \"analysis\": {\n"
         "    \"block\": \"corrupt\",\n"
         "    \"header\": \"corrupt\",\n"
         "    \"body\": \"(unknown)\",\n"
         "    \"trailer\": \"clean\"\n"
         "  },\n"
         "  \"alloc-thread-id\": 47,\n"
@@ skipping 16 matching lines @@
     block_info.milliseconds_since_free = 100;
 
     crashdata::Value value;
     MemoryRanges memory_ranges;
     PopulateBlockInfo(runtime_->shadow(), block_info, true, &value,
                       &memory_ranges);
     std::string json;
     EXPECT_TRUE(crashdata::ToJson(true, &value, &json));
     const char kExpected[] =
         "{\n"
+#ifndef _WIN64
         "  \"header\": \"0x%08X\",\n"
+#else
+        "  \"header\": \"0x%08llX\",\n"
+#endif
         "  \"user-size\": 8,\n"
         "  \"state\": \"quarantined (flooded)\",\n"
         "  \"heap-type\": \"WinHeap\",\n"
         "  \"analysis\": {\n"
         "    \"block\": \"corrupt\",\n"
         "    \"header\": \"corrupt\",\n"
         "    \"body\": \"(unknown)\",\n"
         "    \"trailer\": \"clean\"\n"
         "  },\n"
         "  \"alloc-thread-id\": 47,\n"
         "  \"alloc-stack\": [\n"
         "    \"0x00000001\", \"0x00000002\"\n"
         "  ],\n"
         "  \"free-thread-id\": 32,\n"
         "  \"free-stack\": [\n"
         "    \"0x00000003\", \"0x00000004\", \"0x00000005\"\n"
         "  ],\n"
         "  \"milliseconds-since-free\": 100,\n"
         "  \"contents\": {\n"
         "    \"type\": \"blob\",\n"
         "    \"address\": \"0x%08zX\",\n"
 #ifndef _WIN64
         "    \"size\": 48,\n"
 #else
-        "    \"size\": 56,\n"
+        "    \"size\": 64,\n"
 #endif
         "    \"data\": null\n"
         "  },\n"
         "  \"shadow\": {\n"
         "    \"type\": \"blob\",\n"
         "    \"address\": \"0x%08zX\",\n"
 #ifndef _WIN64
         "    \"size\": 6,\n"
 #else
-        "    \"size\": 7,\n"
+        "    \"size\": 8,\n"
 #endif
         "    \"data\": null\n"
         "  }\n"
         "}";
     std::string expected = base::StringPrintf(
         kExpected, block_info.header, block_info.header, BlockShadowAddress());
     EXPECT_EQ(expected, json);
 
     ASSERT_EQ(2, memory_ranges.size());
     const char* kExpectedMemoryRangesAddresses[] = {
         reinterpret_cast<const char*>(block_info.header),
         reinterpret_cast<const char*>(BlockShadowAddress())};
 #ifndef _WIN64
     size_t kExpectedMemoryRangesSize[] = {48, 6};
 #else
-    size_t kExpectedMemoryRangesSize[] = {56, 7};
+    size_t kExpectedMemoryRangesSize[] = {64, 8};
 #endif
     for (int i = 0; i < 2; i++) {
       EXPECT_EQ(kExpectedMemoryRangesAddresses[i], memory_ranges[i].first);
       EXPECT_EQ(kExpectedMemoryRangesSize[i], memory_ranges[i].second);
     }
   }
 }
 
 TEST_F(AsanErrorInfoTest, PopulateCorruptBlockRange) {
   AsanBlockInfo block_info = {};
@@ skipping 11 matching lines @@
 
   std::string json;
   EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
   const char kExpected[] =
       "{\n"
       "  \"address\": \"0xBAADF00D\",\n"
       "  \"length\": 1048576,\n"
       "  \"block-count\": 100,\n"
       "  \"blocks\": [\n"
       "    {\n"
+#ifndef _WIN64
       "      \"header\": \"0x%08X\",\n"
+#else
+      "      \"header\": \"0x%08llX\",\n"
+#endif
       "      \"user-size\": 8,\n"
       "      \"state\": \"allocated\",\n"
       "      \"heap-type\": \"WinHeap\",\n"
       "      \"analysis\": {\n"
       "        \"block\": \"corrupt\",\n"
       "        \"header\": \"corrupt\",\n"
       "        \"body\": \"(unknown)\",\n"
       "        \"trailer\": \"clean\"\n"
       "      },\n"
       "      \"alloc-thread-id\": 47,\n"
@@ skipping 45 matching lines @@
   crashdata::Value info;
   PopulateErrorInfo(runtime_->shadow(), error_info, &info, nullptr);
 
   std::string json;
   EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
   const char kExpected[] =
       "{\n"
       "  \"location\": \"0x00001000\",\n"
       "  \"crash-stack-id\": 1234,\n"
       "  \"block-info\": {\n"
+#ifndef _WIN64
       "    \"header\": \"0x%08X\",\n"
+#else
+      "    \"header\": \"0x%08llX\",\n"
+#endif
       "    \"user-size\": 8,\n"
       "    \"state\": \"allocated\",\n"
       "    \"heap-type\": \"WinHeap\",\n"
       "    \"analysis\": {\n"
       "      \"block\": \"corrupt\",\n"
       "      \"header\": \"corrupt\",\n"
       "      \"body\": \"(unknown)\",\n"
       "      \"trailer\": \"clean\"\n"
       "    },\n"
       "    \"alloc-thread-id\": 47,\n"
@@ skipping 10 matching lines @@
       "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\",\n"
       "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\",\n"
 #ifdef _WIN64
       "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\",\n"
 #endif
       "        \"0xC3\", \"0xC3\", \"0xC3\", \"0xC3\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\",\n"
+#ifdef _WIN64
+      "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
+      " \"0x00\", \"0x00\",\n"
+#endif
       "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\",\n"
       "        \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
       " \"0x00\", \"0x00\"\n"
       "      ]\n"
       "    },\n"
       "    \"shadow\": {\n"
       "      \"type\": \"blob\",\n"
       "      \"address\": \"0x%08zX\",\n"
       "      \"size\": null,\n"
       "      \"data\": [\n"
 #ifndef _WIN64
       "        \"0xE0\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\", \"0xF4\"\n"
 #else
       "        \"0xE0\", \"0xFA\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\","
-      " \"0xF4\"\n"
+      " \"0xFB\", \"0xF4\"\n"
 #endif
       "      ]\n"
       "    }\n"
       "  },\n"
       "  \"error-type\": \"wild-access\",\n"
       "  \"access-mode\": \"read\",\n"
       "  \"access-size\": 4,\n"
       "  \"shadow-memory-index\": 512,\n"
       "  \"shadow-memory\": {\n"
       "    \"type\": \"blob\",\n"
@@ skipping 30 matching lines @@
       "  \"heap-is-corrupt\": 1,\n"
       "  \"corrupt-range-count\": 10,\n"
       "  \"corrupt-block-count\": 200,\n"
       "  \"corrupt-ranges\": [\n"
       "    {\n"
       "      \"address\": \"0xBAADF00D\",\n"
       "      \"length\": 1048576,\n"
       "      \"block-count\": 100,\n"
       "      \"blocks\": [\n"
       "        {\n"
+#ifndef _WIN64
       "          \"header\": \"0x%08X\",\n"
+#else
+      "          \"header\": \"0x%08llX\",\n"
+#endif
       "          \"user-size\": 8,\n"
       "          \"state\": \"allocated\",\n"
       "          \"heap-type\": \"WinHeap\",\n"
       "          \"analysis\": {\n"
       "            \"block\": \"corrupt\",\n"
       "            \"header\": \"corrupt\",\n"
       "            \"body\": \"(unknown)\",\n"
       "            \"trailer\": \"clean\"\n"
       "          },\n"
       "          \"alloc-thread-id\": 47,\n"
@@ skipping 66 matching lines @@
   MemoryRanges memory_ranges;
   PopulateErrorInfo(runtime_->shadow(), error_info, &info, &memory_ranges);
 
   std::string json;
   EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
   const char kExpected[] =
       "{\n"
       "  \"location\": \"0x00001000\",\n"
       "  \"crash-stack-id\": 1234,\n"
       "  \"block-info\": {\n"
+#ifndef _WIN64
       "    \"header\": \"0x%08X\",\n"
+#else
+      "    \"header\": \"0x%08llX\",\n"
+#endif
       "    \"user-size\": 8,\n"
       "    \"state\": \"allocated\",\n"
       "    \"heap-type\": \"WinHeap\",\n"
       "    \"analysis\": {\n"
       "      \"block\": \"corrupt\",\n"
       "      \"header\": \"corrupt\",\n"
       "      \"body\": \"(unknown)\",\n"
       "      \"trailer\": \"clean\"\n"
       "    },\n"
       "    \"alloc-thread-id\": 47,\n"
       "    \"alloc-stack\": [\n"
       "      \"0x00000001\", \"0x00000002\"\n"
       "    ],\n"
       "    \"contents\": {\n"
       "      \"type\": \"blob\",\n"
+#ifndef _WIN64
       "      \"address\": \"0x%08zX\",\n"
-#ifndef _WIN64
       "      \"size\": 48,\n"
 #else
-      "      \"size\": 56,\n"
+      "      \"address\": \"0x%08llX\",\n"
+      "      \"size\": 64,\n"
 #endif
       "      \"data\": null\n"
       "    },\n"
       "    \"shadow\": {\n"
       "      \"type\": \"blob\",\n"
+#ifndef _WIN64
       "      \"address\": \"0x%08zX\",\n"
-#ifndef _WIN64
       "      \"size\": 6,\n"
 #else
-      "      \"size\": 7,\n"
+      "      \"address\": \"0x%08llX\",\n"
+      "      \"size\": 8,\n"
 #endif
       "      \"data\": null\n"
       "    }\n"
       "  },\n"
       "  \"error-type\": \"wild-access\",\n"
       "  \"access-mode\": \"read\",\n"
       "  \"access-size\": 4,\n"
       "  \"shadow-memory-index\": 512,\n"
       "  \"shadow-memory\": {\n"
       "    \"type\": \"blob\",\n"
+#ifndef _WIN64
       "    \"address\": \"0x%08zX\",\n"
+#else
+      "    \"address\": \"0x%08llX\",\n"
+#endif
       "    \"size\": 64,\n"
       "    \"data\": null\n"
       "  },\n"
       "  \"page-bits-index\": 0,\n"
       "  \"page-bits\": {\n"
       "    \"type\": \"blob\",\n"
+#ifndef _WIN64
       "    \"address\": \"0x%08zX\",\n"
+#else
+      "    \"address\": \"0x%08llX\",\n"
+#endif
       "    \"size\": 3,\n"
       "    \"data\": null\n"
       "  },\n"
       "  \"heap-is-corrupt\": 1,\n"
       "  \"corrupt-range-count\": 10,\n"
       "  \"corrupt-block-count\": 200,\n"
       "  \"corrupt-ranges\": [\n"
       "    {\n"
       "      \"address\": \"0xBAADF00D\",\n"
       "      \"length\": 1048576,\n"
       "      \"block-count\": 100,\n"
       "      \"blocks\": [\n"
       "        {\n"
+#ifndef _WIN64
       "          \"header\": \"0x%08X\",\n"
+#else
+      "          \"header\": \"0x%08llX\",\n"
+#endif
       "          \"user-size\": 8,\n"
       "          \"state\": \"allocated\",\n"
       "          \"heap-type\": \"WinHeap\",\n"
       "          \"analysis\": {\n"
       "            \"block\": \"corrupt\",\n"
       "            \"header\": \"corrupt\",\n"
       "            \"body\": \"(unknown)\",\n"
       "            \"trailer\": \"clean\"\n"
       "          },\n"
       "          \"alloc-thread-id\": 47,\n"
@@ skipping 31 matching lines @@
   // Check memory ranges.
   ASSERT_EQ(4, memory_ranges.size());
   const char* kExpectedMemoryRangesAddresses[] = {
       reinterpret_cast<const char*>(block_info.header),
       reinterpret_cast<const char*>(BlockShadowAddress()),
       reinterpret_cast<const char*>(shadow_memory.address),
       reinterpret_cast<const char*>(runtime_->shadow()->page_bits())};
 #ifndef _WIN64
   size_t kExpectedMemoryRangesSize[] = {48, 6, 64, 3};
 #else
-  size_t kExpectedMemoryRangesSize[] = {56, 7, 64, 3};
+  size_t kExpectedMemoryRangesSize[] = {64, 8, 64, 3};
 #endif
   for (int i = 0; i < memory_ranges.size(); i++) {
     EXPECT_EQ(kExpectedMemoryRangesAddresses[i], memory_ranges[i].first)
         << " Where i = " << i;
     EXPECT_EQ(kExpectedMemoryRangesSize[i], memory_ranges[i].second)
         << " Where i = " << i;
   }
 }
 
 TEST_F(AsanErrorInfoTest, CrashdataProtobufToErrorInfo) {
@@ skipping 20 matching lines @@
   EXPECT_EQ(block_info.state, error_info_from_proto.block_info.state);
   EXPECT_EQ(block_info.heap_type, error_info_from_proto.block_info.heap_type);
   EXPECT_EQ(block_info.alloc_tid, error_info_from_proto.block_info.alloc_tid);
   EXPECT_EQ(block_info.free_tid, error_info_from_proto.block_info.free_tid);
   EXPECT_EQ(block_info.milliseconds_since_free,
             error_info_from_proto.block_info.milliseconds_since_free);
 }
 
 }  // namespace asan
 }  // namespace agent