Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LayoutLib: Fix System.arraycopy()

Browse Source 
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
This commit is contained in:
Deepanshu Gupta
2015-01-10 04:56:36 +00:00
committed by android-build-merger
parent 9e0ed1c2d6 51fb7754fc
commit 55c7bd4dac
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/create/README.txt
View File

@@ -131,8 +131,8 @@ valid StackMapTable. As a side benefit of this, we can continue to support Java
Mac has horrible font rendering support.
ReplaceMethodCallsAdapter replaces calls to certain methods. Currently, it only rewrites calls to
java.lang.System.arraycopy([CI[CII)V, which is not part of the Desktop VM to call the more general
method java.lang.System.arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V.
specialized versions of java.lang.System.arraycopy(), which are not part of the Desktop VM to call
the more general method java.lang.System.arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V.
The ClassAdapters are chained together to achieve the desired output. (Look at section 2.2.7
Transformation chains in the asm user guide, link in the References.) The order of execution of

4
tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmAnalyzer.java
View File

@@ -726,9 +726,9 @@ public class AsmAnalyzer {
considerDesc(desc);
// Check if method is java.lang.System.arrayCopy([CI[CII)V
// Check if method is a specialized version of java.lang.System.arrayCopy()
if (owner.equals("java/lang/System") && name.equals("arraycopy")
&& desc.equals("([CI[CII)V")) {
&& !desc.equals("(Ljava/lang/Object;ILjava/lang/Object;II)V")) {
mReplaceMethodCallClasses.add(mOwnerClass);
}
}

23
tools/layoutlib/create/src/com/android/tools/layoutlib/create/ReplaceMethodCallsAdapter.java
View File

@@ -20,10 +20,23 @@ import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
/**
* Replaces calls to certain methods that do not exist in the Desktop VM.
*/
public class ReplaceMethodCallsAdapter extends ClassVisitor {
/**
* Descriptors for specialized versions {@link System#arraycopy} that are not present on the
* Desktop VM.
*/
private static Set<String> ARRAYCOPY_DESCRIPTORS = new HashSet<String>(Arrays.asList(
"([CI[CII)V", "([BI[BII)V", "([SI[SII)V", "([II[III)V",
"([JI[JII)V", "([FI[FII)V", "([DI[DII)V", "([ZI[ZII)V"));
public ReplaceMethodCallsAdapter(ClassVisitor cv) {
super(Opcodes.ASM4, cv);
}
@@ -42,10 +55,12 @@ public class ReplaceMethodCallsAdapter extends ClassVisitor {
@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
// Check if method is java.lang.System.arrayCopy([CI[CII)V
if (owner.equals("java/lang/System") && name.equals("arraycopy")
&& desc.equals("([CI[CII)V")) {
desc = "(Ljava/lang/Object;ILjava/lang/Object;II)V";
// Check if method is a specialized version of java.lang.System.arrayCopy
if (owner.equals("java/lang/System") && name.equals("arraycopy")) {
if (ARRAYCOPY_DESCRIPTORS.contains(desc)) {
desc = "(Ljava/lang/Object;ILjava/lang/Object;II)V";
}
}
super.visitMethodInsn(opcode, owner, name, desc);
}