ART: Boolean simplifier fix
Boolean simplifier should not remove condition instruction
if it has side effects.
Change-Id: I108b69ec05a49e5543ee956ad9c691b52179cf6c
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
diff --git a/compiler/optimizing/boolean_simplifier.cc b/compiler/optimizing/boolean_simplifier.cc
index 329112a..84201c3 100644
--- a/compiler/optimizing/boolean_simplifier.cc
+++ b/compiler/optimizing/boolean_simplifier.cc
@@ -154,11 +154,6 @@
// entry block. Any following blocks would have had the join block
// as a dominator, and `MergeWith` handles changing that to the
// entry block.
-
- // Remove the original condition if it is now unused.
- if (!if_condition->HasUses()) {
- if_condition->GetBlock()->RemoveInstructionOrPhi(if_condition);
- }
}
void HBooleanSimplifier::Run() {
diff --git a/test/463-checker-boolean-simplifier/src/Main.java b/test/463-checker-boolean-simplifier/src/Main.java
index 0b75930..dd17e77 100644
--- a/test/463-checker-boolean-simplifier/src/Main.java
+++ b/test/463-checker-boolean-simplifier/src/Main.java
@@ -119,9 +119,6 @@
/// CHECK-DAG: <<Cond:z\d+>> LessThan [<<ParamX>>,<<ParamY>>]
/// CHECK-DAG: Return [<<Cond>>]
- /// CHECK-START: boolean Main.LessThan(int, int) boolean_simplifier (after)
- /// CHECK-NOT: GreaterThanOrEqual
-
public static boolean LessThan(int x, int y) {
return (x < y) ? true : false;
}
diff --git a/test/524-boolean-simplifier-regression/expected.txt b/test/524-boolean-simplifier-regression/expected.txt
new file mode 100644
index 0000000..863339f
--- /dev/null
+++ b/test/524-boolean-simplifier-regression/expected.txt
@@ -0,0 +1 @@
+Passed
diff --git a/test/524-boolean-simplifier-regression/info.txt b/test/524-boolean-simplifier-regression/info.txt
new file mode 100644
index 0000000..b38d71c
--- /dev/null
+++ b/test/524-boolean-simplifier-regression/info.txt
@@ -0,0 +1 @@
+Regression test for optimizing boolean simplifier.
diff --git a/test/524-boolean-simplifier-regression/src/Main.java b/test/524-boolean-simplifier-regression/src/Main.java
new file mode 100644
index 0000000..a8830bb
--- /dev/null
+++ b/test/524-boolean-simplifier-regression/src/Main.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Main {
+
+ public static boolean test2() {
+ throw new NullPointerException();
+ }
+
+ public static boolean test1() {
+ System.out.println("Passed");
+ try {
+ test2();
+ } catch (NullPointerException npe) {
+ }
+ return true;
+ }
+
+ public static void main(String[] args) {
+ boolean b=false;
+
+ b = (test1() || (b = b)) & b;
+ }
+}