Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c480fbc5 authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

Revert "Keep minimal abort when enabling integer overflow check" 

This reverts commit 34448f24.

Reason for revert: RAM regression + something mainline related
Bug: b/235090315
Bug: b/235181175
Bug: b/233840743

Change-Id: Ia1d1b1428c19b1e297dc75618d640bdac81713b0
parent 34448f24

cc/sanitize.go

+5 −6
Original line number Diff line number Diff line
@@ -722,6 +722,11 @@ 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, " "))

			flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib)

		}



		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")
@@ -730,12 +735,6 @@ 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, " "))

			flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib)

		}



		// 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")