commit 639f279a0b68234c8d5904746d8d888c81894409
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 25 00:39:48 2018 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 25 09:29:35 2018 +0100
tree aa0c9eb1696788b75f2e8721bb25c4dfe98bfd25
parent 26f048f48cdb1e884aab2b6fddf26d58346d29ad

Turn DCHECKs into return false in ReplaceUninitializedStringPhis.

Until https://android-review.googlesource.com/c/platform/art/+/754691,
gets resolves, temporarily change
the method to return whether it fits the expecations, and bail
to interpreter if not.

Test: test.py
bug: 112537407
Change-Id: I60f0c3bc75f83b3b8a6c19e733c64440881a5a76

compiler/optimizing/ssa_builder.h

diff --git a/compiler/optimizing/ssa_builder.h b/compiler/optimizing/ssa_builder.h
index 7655445..bae15ac 100644
--- a/compiler/optimizing/ssa_builder.h
+++ b/compiler/optimizing/ssa_builder.h
@@ -123,7 +123,7 @@
   HArrayGet* GetFloatOrDoubleEquivalentOfArrayGet(HArrayGet* aget);
 
   void RemoveRedundantUninitializedStrings();
-  void ReplaceUninitializedStringPhis();
+  bool ReplaceUninitializedStringPhis();
 
   HGraph* const graph_;
   Handle<mirror::ClassLoader> class_loader_;