Fix pruning invoke environment for StringBuilder append pattern.
Test: Extra test in 697-checker-string-append
Test: testrunner.py --host --optimizing
Bug: 19575890
Bug: 144300699
Change-Id: I3934eb01a62dbbed8b8f9f94ce3ba02051538bb0
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 63c5965..d272bfa 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -2630,10 +2630,12 @@
block->InsertInstructionBefore(append, invoke);
invoke->ReplaceWith(append);
// Copy environment, except for the StringBuilder uses.
- for (size_t i = 0, size = invoke->GetEnvironment()->Size(); i != size; ++i) {
- if (invoke->GetEnvironment()->GetInstructionAt(i) == sb) {
- invoke->GetEnvironment()->RemoveAsUserOfInput(i);
- invoke->GetEnvironment()->SetRawEnvAt(i, nullptr);
+ for (HEnvironment* env = invoke->GetEnvironment(); env != nullptr; env = env->GetParent()) {
+ for (size_t i = 0, size = env->Size(); i != size; ++i) {
+ if (env->GetInstructionAt(i) == sb) {
+ env->RemoveAsUserOfInput(i);
+ env->SetRawEnvAt(i, /*instruction=*/ nullptr);
+ }
}
}
append->CopyEnvironmentFrom(invoke->GetEnvironment());