commit bf78bbdfc564602bb1a4d27f05f1c3898a6eb83f
author Yi Kong <yikong@google.com> Thu Sep 02 02:46:27 2021 +0800
committer Yi Kong <yikong@google.com> Thu Sep 02 17:08:19 2021 +0800
tree 540e1686590aa8f3bb45d01d05563a221233aead
parent aae81d4a9c67bcaee9f824c12d1f3f9ed3340e79

Fix -Wnull-pointer-subtraction warning

Bug: 197230471
Test: build
Change-Id: If842f00819736bf6f111f44ec752ca2f815866b4

tests/simplecpu/jni/CpuNativeJni.cpp

diff --git a/tests/simplecpu/jni/CpuNativeJni.cpp b/tests/simplecpu/jni/CpuNativeJni.cpp
index 4ea0dc0..54291c0 100644
--- a/tests/simplecpu/jni/CpuNativeJni.cpp
+++ b/tests/simplecpu/jni/CpuNativeJni.cpp
@@ -41,7 +41,7 @@
         } while (--i > 0);              \
 }
 
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
+#define SWAPINIT(a, es) swaptype = ((uintptr_t) a) % sizeof(long) || \
     es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static __inline void