I think the change looks good. ================ Comment at: lib/asan/asan_thread.cc:152 @@ -148,1 +151,3 @@ + tls_end_ = tls_begin_ + tls_size; + int local; ---------------- Nit: spare newline. http://llvm-reviews.chandlerc.com/D862