# HG changeset patch # User Michael Starzinger # Date 1301263384 -7200 # Node ID b7b15d19d6ef2e9a4ea428428072efc2234be150 # Parent 463222781d6781465680a7cba67886a10c30593c Added regression test for recent bug fix. * rewriter/SelfMergeTest.java: New regression test. diff -r 463222781d67 -r b7b15d19d6ef src/test/java/org/icedrobot/daneel/rewriter/SelfMergeTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/org/icedrobot/daneel/rewriter/SelfMergeTest.java Mon Mar 28 00:03:04 2011 +0200 @@ -0,0 +1,73 @@ +/* + * Daneel - Dalvik to Java bytecode compiler + * Copyright (C) 2011 IcedRobot team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * This file is subject to the "Classpath" exception: + * + * Linking this library statically or dynamically with other modules is + * making a combined work based on this library. Thus, the terms and + * conditions of the GNU General Public License cover the whole + * combination. + * + * As a special exception, the copyright holders of this library give you + * permission to link this library with independent modules to produce an + * executable, regardless of the license terms of these independent + * modules, and to copy and distribute the resulting executable under terms + * of your choice, provided that you also meet, for each linked independent + * module, the terms and conditions of the license of that module. An + * independent module is a module which is not derived from or based on + * this library. If you modify this library, you may extend this exception + * to your version of the library, but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. + */ + +package org.icedrobot.daneel.rewriter; + +import static org.junit.Assert.assertEquals; + +import org.icedrobot.daneel.DexifyingRunner; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * This is a regression test for a bug in {@link Interpreter#merge} which tried + * to merge a register to itself. When patching the instruction list is that + * register gets patched twice. Here, ASM silently destroys existing + * instructions. + */ +@RunWith(DexifyingRunner.class) +public class SelfMergeTest { + + @Test + public void test() { + assertEquals(1, DEXCode.check(true, true)); + assertEquals(0, DEXCode.check(false, true)); + assertEquals(0, DEXCode.check(true, false)); + assertEquals(0, DEXCode.check(false, false)); + } + + // Keep this class named "DEXCode" to push it through Daneel. + private static class DEXCode { + public static int check(boolean b1, boolean b2) { + float f = 1; + if (b1 && b2) + return (int) f; + else + return 0; + } + }; +}