StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable object-size sanitizer for C++" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-09-18 19:44:30 +00:00
committed by Gerrit Code Review
parent 1fa2cf0f88 76e99ad68e
commit 411346c919
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -238,6 +238,11 @@ func (c Config) ReleaseAconfigFlagDefaultPermission() string {
return c.config.productVariables.ReleaseAconfigFlagDefaultPermission return c.config.productVariables.ReleaseAconfigFlagDefaultPermission
} }
// Enable object size sanitizer
func (c Config) ReleaseBuildObjectSizeSanitizer() bool {
return c.config.productVariables.GetBuildFlagBool("RELEASE_BUILD_OBJECT_SIZE_SANITIZER")
}
// The flag indicating behavior for the tree wrt building modules or using prebuilts // The flag indicating behavior for the tree wrt building modules or using prebuilts
// derived from RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE // derived from RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE
func (c Config) ReleaseDefaultModuleBuildFromSource() bool { func (c Config) ReleaseDefaultModuleBuildFromSource() bool {

8
cc/sanitize.go
View File

@@ -1437,11 +1437,11 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
//"null", //"null",
//"shift-base", //"shift-base",
//"signed-integer-overflow", //"signed-integer-overflow",
// TODO(danalbert): Fix UB in libc++'s __tree so we can turn this on.
// https://llvm.org/PR19302
// http://reviews.llvm.org/D6974
// "object-size",
) )
if mctx.Config().ReleaseBuildObjectSizeSanitizer() {
sanitizers = append(sanitizers, "object-size")
}
} }
sanitizers = append(sanitizers, sanProps.Misc_undefined...) sanitizers = append(sanitizers, sanProps.Misc_undefined...)
} }