Merge "Restore "Default to zero-initialization instead of pattern."" am: 59759dff24

Change-Id: Ieae271ee82bb82252032a231dfcc21303af3a5cf
This commit is contained in:
Treehugger Robot
2020-05-15 05:37:18 +00:00
committed by Automerger Merge Worker

View File

@@ -162,7 +162,7 @@ func init() {
// http://b/131390872 // http://b/131390872
// Automatically initialize any uninitialized stack variables. // Automatically initialize any uninitialized stack variables.
// Prefer zero-init if both options are set. // Prefer zero-init if multiple options are set.
if ctx.Config().IsEnvTrue("AUTO_ZERO_INITIALIZE") { if ctx.Config().IsEnvTrue("AUTO_ZERO_INITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang") flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")
} else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") { } else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") {
@@ -170,8 +170,8 @@ func init() {
} else if ctx.Config().IsEnvTrue("AUTO_UNINITIALIZE") { } else if ctx.Config().IsEnvTrue("AUTO_UNINITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=uninitialized") flags = append(flags, "-ftrivial-auto-var-init=uninitialized")
} else { } else {
// Default to pattern initialization. // Default to zero initialization.
flags = append(flags, "-ftrivial-auto-var-init=pattern") flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")
} }
return strings.Join(flags, " ") return strings.Join(flags, " ")