Index: compiler-rt/lib/hwasan/hwasan_allocator.cpp
===================================================================
--- compiler-rt/lib/hwasan/hwasan_allocator.cpp
+++ compiler-rt/lib/hwasan/hwasan_allocator.cpp
@@ -30,7 +30,11 @@
 static atomic_uint8_t hwasan_allocator_tagging_enabled;
 
 static constexpr tag_t kFallbackAllocTag = 0xBB & kTagMask;
+#if defined(HWASAN_ALIASING_MODE)
 static constexpr tag_t kFallbackFreeTag = 0xBC;
+#else
+static constexpr tag_t kFallbackFreeTag = 0xBC & kTagMask;
+#endif
 
 enum RightAlignMode {
   kRightAlignNever,