teemperor added a comment. We could also check the libc++ version via _LIBCPP_VERSION and just keep the old code around behind an ifdef? Repository: rLLDB LLDB CHANGES SINCE LAST ACTION https://reviews.llvm.org/D58273/new/ https://reviews.llvm.org/D58273