Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" (943cfcec) · Commits · e / os / android_build_soong

cc/sanitize.go

+5 −4

Original line number	Diff line number	Diff line
		@@ -715,10 +715,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
		flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=vptr,function")
		}

		if enableMinimalRuntime(sanitize) {
		flags.Local.CFlags = append(flags.Local.CFlags, strings.Join(minimalRuntimeFlags, " "))
		}

		if Bool(sanitize.Properties.Sanitize.Fuzzer) {
		// When fuzzing, we wish to crash with diagnostics on any bug.
		flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize-trap=all", "-fno-sanitize-recover=all")
		@@ -727,6 +723,11 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
		} else {
		flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-trap=all", "-ftrap-function=abort")
		}

		if enableMinimalRuntime(sanitize) {
		flags.Local.CFlags = append(flags.Local.CFlags, strings.Join(minimalRuntimeFlags, " "))
		}

		// http://b/119329758, Android core does not boot up with this sanitizer yet.
		if toDisableImplicitIntegerChange(flags.Local.CFlags) {
		flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=implicit-integer-sign-change")