summaryrefslogtreecommitdiff
path: root/cc
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-17 11:02:03 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-17 11:02:03 -0700
commitabdf1eb1244249a552d785a0dcf065be1abd3c87 (patch)
tree6abc78540ac0ca704adecd16b0d6e6f6943d6f01 /cc
parent3a25c05eb91fb15ac5dd542679f1bde5faf4b2db (diff)
parente8031786ce3b58304fb00c1c04743953e8d77951 (diff)
Merge "Make object-size sanitizer on by default" into main am: 8b7a3b8087 am: e8031786ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3544565 Change-Id: I78fa3e481cdd9cb07f745b6b0dd5dc6c2c41cbea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cc')
-rw-r--r--cc/sanitize.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index b704ef4bf..f0b0308ae 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -1422,6 +1422,7 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
sanitizers = append(sanitizers,
"bool",
"integer-divide-by-zero",
+ "object-size",
"return",
"returns-nonnull-attribute",
"shift-exponent",
@@ -1438,10 +1439,6 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
//"shift-base",
//"signed-integer-overflow",
)
-
- if mctx.Config().ReleaseBuildObjectSizeSanitizer() {
- sanitizers = append(sanitizers, "object-size")
- }
}
sanitizers = append(sanitizers, sanProps.Misc_undefined...)
}