LGTM (deferring to kcc for approval). What about the test? :) ================ Comment at: lib/lsan/lsan_common.cc:432 @@ +431,3 @@ + __lsan::disable_counter++; +#endif +} ---------------- #endif // CAN_SANITIZE_LEAKS http://llvm-reviews.chandlerc.com/D1017