diff options
author | David Brazdil <dbrazdil@google.com> | 2015-04-01 18:34:33 +0100 |
---|---|---|
committer | David Brazdil <dbrazdil@google.com> | 2015-04-01 18:36:21 +0100 |
commit | aef17ecb7ba2a3ec5a209804f6a87c7696bb4d24 (patch) | |
tree | 16833d6fb6571989451febe05398d332414e3d38 | |
parent | d29c27ff21b8cce7c06a4aff1bd382305df4d381 (diff) | |
download | art-aef17ecb7ba2a3ec5a209804f6a87c7696bb4d24.zip art-aef17ecb7ba2a3ec5a209804f6a87c7696bb4d24.tar.gz art-aef17ecb7ba2a3ec5a209804f6a87c7696bb4d24.tar.bz2 |
ART: Regression test for condition materialization bug
This adds a regression test previously omitted in a hotfix.
Bug: 19999189
Change-Id: I02acb935960f22028bf877cd270b04e17515068f
3 files changed, 50 insertions, 0 deletions
diff --git a/test/469-condition-materialization-regression/expected.txt b/test/469-condition-materialization-regression/expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/469-condition-materialization-regression/expected.txt diff --git a/test/469-condition-materialization-regression/info.txt b/test/469-condition-materialization-regression/info.txt new file mode 100644 index 0000000..59290f0 --- /dev/null +++ b/test/469-condition-materialization-regression/info.txt @@ -0,0 +1,2 @@ +Regression test for optimizing's code generator which wouldn't +materialize a condition when used only by an environment. diff --git a/test/469-condition-materialization-regression/src/Main.java b/test/469-condition-materialization-regression/src/Main.java new file mode 100644 index 0000000..0be386a --- /dev/null +++ b/test/469-condition-materialization-regression/src/Main.java @@ -0,0 +1,48 @@ +/* + * 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 { + + // This tests a specific situation when condition ends up + // not getting materialized if only used by an environment. + + private static Object obj; + + private static int useValue(boolean value) { + return 42; + } + + private static int runTest(boolean input1) { + boolean negation = !input1; + // Need the negation to appear in front of an If, and + // its condition to disappear. 'javac' will generate + // "if (!input1)" here and GVN will collapse the two + // conditions. + if (input1) { + // Generates an environment use of 'negation'. + obj = new Object(); + } + // Uses 'negation' but disappears with inlining. + return useValue(negation); + } + + public static void main(String[] args) throws Exception { + int result = runTest(true); + if (result != 42) { + throw new Error("Expected 42, got " + result); + } + } +} |