tsan: reapply 212531 and 212532 with a fix
don't reset s->addr as well



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@212565 91177308-0d34-0410-b5e6-96231b3b80d8