Revert "Default to zero-initialization instead of pattern."
This reverts commit 7871416eec8ec507c8be36b27a236fccbde54c60.
Reason for revert: This change is breaking CtsNNAPITestCases.TensorRankConstraint (http://b/156464649).
Change-Id: I8831993a7d3c2079a8d76a23dfbdf9c7c1543181
diff --git a/cc/config/global.go b/cc/config/global.go
index 5f28c87..4e51ae9 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -162,7 +162,7 @@
// http://b/131390872
// Automatically initialize any uninitialized stack variables.
- // Prefer zero-init if multiple options are set.
+ // Prefer zero-init if both options are set.
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")
} else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") {
@@ -170,8 +170,8 @@
} else if ctx.Config().IsEnvTrue("AUTO_UNINITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=uninitialized")
} else {
- // Default to zero initialization.
- flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")
+ // Default to pattern initialization.
+ flags = append(flags, "-ftrivial-auto-var-init=pattern")
}
return strings.Join(flags, " ")