Track changes from clang r212387, r212388