commit 04257ad55543b1db0d6342a2cfceb9cd2941e668
author Chris Forbes <chrisforbes@google.com> Tue Oct 04 10:08:31 2016 +1300
committer Chris Forbes <chrisforbes@google.com> Tue Oct 04 10:54:45 2016 +1300
tree cfc232cf9b26e409ec5491ebf39ef40f5a2d1b87
parent eab17f1ed3775cd2473e781915ab216c95d21c65

layers: Be careful about casts. ptr -> uint64_t& isnt right on 32bit.

Signed-off-by: Chris Forbes <chrisforbes@google.com>

layers/object_tracker.cpp

diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp
index 13e1502..0a8f7a7 100644
--- a/layers/object_tracker.cpp
+++ b/layers/object_tracker.cpp
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include <unordered_map>
+#include <type_traits>
 
 #include "vk_layer_config.h"
 #include "vk_layer_data.h"
@@ -245,7 +246,10 @@
 template <typename T1, typename T2>
 static void CreateObject(T1 dispatchable_object, T2 object, VkDebugReportObjectTypeEXT object_type, bool custom_allocator) {
     layer_data *instance_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map);
-    auto object_handle = reinterpret_cast<uint64_t &>(object);
+
+    auto object_handle = std::is_pointer<T2>::value
+        ? reinterpret_cast<uint64_t>(object)
+        : reinterpret_cast<uint64_t &>(object);
 
     log_msg(instance_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, object_type, object_handle,
             __LINE__, OBJTRACK_NONE, LayerName, "OBJ[0x%" PRIxLEAST64 "] : CREATE %s object 0x%" PRIxLEAST64, object_track_index++,
@@ -264,7 +268,9 @@
 static void DestroyObject(T1 dispatchable_object, T2 object, VkDebugReportObjectTypeEXT object_type, bool custom_allocator) {
     layer_data *device_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map);
 
-    uint64_t object_handle = reinterpret_cast<uint64_t &>(object);
+    auto object_handle = std::is_pointer<T2>::value
+        ? reinterpret_cast<uint64_t>(object)
+        : reinterpret_cast<uint64_t &>(object);
 
     auto item = device_data->object_map[object_type].find(object_handle);
     if (item != device_data->object_map[object_type].end()) {
@@ -305,7 +311,9 @@
     if (null_allowed && (object == VK_NULL_HANDLE)) {
         return false;
     }
-    auto object_handle = reinterpret_cast<uint64_t &>(object);
+    auto object_handle = std::is_pointer<T2>::value
+        ? reinterpret_cast<uint64_t>(object)
+        : reinterpret_cast<uint64_t &>(object);
     layer_data *device_data = get_my_data_ptr(get_dispatch_key(dispatchable_object), layer_data_map);
     if (device_data->object_map[object_type].find(object_handle) == device_data->object_map[object_type].end()) {
         // If object is an image, also look for it in the swapchain image map