# HG changeset patch # User forax # Date 1301693956 -7200 # Node ID 43109f72e569d4aab16c11672ea20f78948c72d2 # Parent cf71c6ab82fcef13a35ffa9b8831939e6dfc887d Fix: owner of a method call can be an array - add a test to cover that bug: MethodCallArrayTest diff -r cf71c6ab82fc -r 43109f72e569 src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java --- a/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java Fri Apr 01 11:15:49 2011 +0200 +++ b/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java Fri Apr 01 23:39:16 2011 +0200 @@ -527,7 +527,7 @@ r += asmType.getSize(); } - owner = TypeUtil.convertDescToInternal(owner); + owner = Type.getType(owner).getInternalName(); mv.visitMethodInsn(javaOpcode, owner, name, desc); returnRegisterType = getReturnTypeFromMethodDescriptor(desc); return; diff -r cf71c6ab82fc -r 43109f72e569 src/test/java/org/icedrobot/daneel/rewriter/ArrayMethodCall.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/org/icedrobot/daneel/rewriter/ArrayMethodCall.java Fri Apr 01 23:39:16 2011 +0200 @@ -0,0 +1,58 @@ +/* + * 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 org.icedrobot.daneel.DexifyingRunner; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(DexifyingRunner.class) +public class ArrayMethodCall { + + @Test + public void testArrayMethodCall() { + DEXCode.m(new String[]{ "foo" }); + } + + // Keep this class named "DEXCode" to push it through Daneel. + private static class DEXCode { + public static void m(String[] args) { + args = args.clone(); + } + } +}