Switch to clang-r407598 (12.0.1).

Also suppress a clang-tidy warning and a ubsan check to pass compilation.

Bug: 171348143
Test: build.
Change-Id: Ie5162c15df172cefd7cff9776e54531fd620bc23
This commit is contained in:
Yabin Cui
2020-11-30 15:47:45 -08:00
parent 097de78352
commit db7dda89f3
3 changed files with 25 additions and 2 deletions

View File

@@ -458,6 +458,22 @@ func toDisableImplicitIntegerChange(flags []string) bool {
return false
}
func toDisableUnsignedShiftBaseChange(flags []string) bool {
// Returns true if any flag is fsanitize*integer, and there is
// no explicit flag about sanitize=unsigned-shift-base.
for _, f := range flags {
if strings.Contains(f, "sanitize=unsigned-shift-base") {
return false
}
}
for _, f := range flags {
if strings.HasPrefix(f, "-fsanitize") && strings.Contains(f, "integer") {
return true
}
}
return false
}
func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
minimalRuntimeLib := config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(ctx.toolchain()) + ".a"
minimalRuntimePath := "${config.ClangAsanLibDir}/" + minimalRuntimeLib
@@ -614,6 +630,10 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
if toDisableImplicitIntegerChange(flags.Local.CFlags) {
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=implicit-integer-sign-change")
}
// http://b/171275751, Android doesn't build with this sanitizer yet.
if toDisableUnsignedShiftBaseChange(flags.Local.CFlags) {
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=unsigned-shift-base")
}
}
if len(sanitize.Properties.DiagSanitizers) > 0 {