From b4ac05d76378aed7122d195b987c4b7c583c2cc6 Mon Sep 17 00:00:00 2001
From: Jianzhou Zhao <jianzhouzh@google.com>
Date: Thu, 19 Nov 2020 04:39:25 +0000
Subject: [PATCH] Replace the equivalent code by UnionTableAddr

UnionTableAddr is always inlined.

Reviewed-by: morehouse

Differential Revision: https://reviews.llvm.org/DD91758
---
 compiler-rt/lib/dfsan/dfsan.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler-rt/lib/dfsan/dfsan.cpp b/compiler-rt/lib/dfsan/dfsan.cpp
index 36381c6896ae..db610857834c 100644
--- a/compiler-rt/lib/dfsan/dfsan.cpp
+++ b/compiler-rt/lib/dfsan/dfsan.cpp
@@ -144,8 +144,7 @@ int __dfsan::vmaSize;
 #endif
 
 static uptr UnusedAddr() {
-  return MappingArchImpl<MAPPING_UNION_TABLE_ADDR>()
-         + sizeof(dfsan_union_table_t);
+  return UnionTableAddr() + sizeof(dfsan_union_table_t);
 }
 
 static atomic_dfsan_label *union_table(dfsan_label l1, dfsan_label l2) {
-- 
2.34.1