Add support for abstract and native methods generation

vmutafov · drewhannay · commit 7929d112da9b · 2019-07-26T14:20:37.000-07:00
diff --git a/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java b/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java
@@ -480,6 +480,57 @@ public <G> void testDeclareConstructor() throws Exception {
         assertEquals(0xabcd, a.get(instance));
     }
 
+    @Test
+    public void testDeclareNativeMethod() throws Exception {
+        /*
+         * class Generated {
+         *   public Generated() {
+         *   }
+         *   public native void nativeMethod();
+         * }
+         */
+
+        addDefaultConstructor();
+        String nativeMethodName = "nativeMethod";
+        MethodId<?, Void> nativeMethodToGenerate = GENERATED.getMethod(TypeId.VOID, nativeMethodName);
+        dexMaker.declare(nativeMethodToGenerate, java.lang.reflect.Modifier.PUBLIC | java.lang.reflect.Modifier.NATIVE);
+
+        Class<?> generatedClass = generateAndLoad();
+        Object instance = generatedClass.getConstructor().newInstance();
+        Method nativeMethod = instance.getClass().getMethod(nativeMethodName);
+
+        assertTrue((nativeMethod.getModifiers() & NATIVE) != 0);
+        assertTrue((nativeMethod.getModifiers() & PUBLIC) != 0);
+        assertEquals(void.class, nativeMethod.getReturnType());
+        assertEquals(nativeMethodName, nativeMethod.getName());
+        assertEquals(nativeMethod.getParameterTypes().length, 0);
+    }
+
+    @Test
+    public void testDeclareAbstractClassWithAbstractMethod() throws Exception {
+        /*
+         * public abstract class AbstractClass {
+         *   public abstract void abstractMethod();
+         * }
+         */
+
+        dexMaker.declare(GENERATED, "AbstractClass.java", PUBLIC, TypeId.OBJECT);
+
+        String abstractMethodName = "abstractMethod";
+        MethodId<?, Void> nativeMethodToGenerate = GENERATED.getMethod(TypeId.VOID, abstractMethodName);
+        dexMaker.declare(nativeMethodToGenerate, java.lang.reflect.Modifier.PUBLIC | ABSTRACT);
+
+        Class<?> generatedClass = generateAndLoad();
+        Method nativeMethod = generatedClass.getMethod(abstractMethodName);
+
+        assertTrue((nativeMethod.getModifiers() & ABSTRACT) != 0);
+        assertTrue((nativeMethod.getModifiers() & PUBLIC) != 0);
+        assertEquals(void.class, nativeMethod.getReturnType());
+        assertEquals(abstractMethodName, nativeMethod.getName());
+        assertEquals(nativeMethod.getParameterTypes().length, 0);
+
+    }
+
     @Test
     public void testReturnType() throws Exception {
         testReturnType(boolean.class, true);
@@ -1955,26 +2006,6 @@ public void testPrivateClassesAreUnsupported() {
         }
     }
 
-    @Test
-    public void testAbstractMethodsAreUnsupported() {
-        MethodId<?, Void> methodId = GENERATED.getMethod(TypeId.VOID, "call");
-        try {
-            dexMaker.declare(methodId, ABSTRACT);
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    public void testNativeMethodsAreUnsupported() {
-        MethodId<?, Void> methodId = GENERATED.getMethod(TypeId.VOID, "call");
-        try {
-            dexMaker.declare(methodId, NATIVE);
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-    }
-
     @Test
     public void testSynchronizedFieldsAreUnsupported() {
         try {
@@ -2005,7 +2036,6 @@ public void testInitialValueWithNonStaticField() {
     // TODO: don't generate multiple times (?)
     // TODO: test array types
     // TODO: test generating an interface
-    // TODO: declare native method or abstract method
     // TODO: get a thrown exception 'e' into a local
     // TODO: move a primitive or reference
 
diff --git a/dexmaker/src/main/java/com/android/dx/DexMaker.java b/dexmaker/src/main/java/com/android/dx/DexMaker.java
@@ -47,8 +47,8 @@
 import java.util.jar.JarOutputStream;
 
 import static com.android.dx.rop.code.AccessFlags.ACC_CONSTRUCTOR;
-import static java.lang.reflect.Modifier.PRIVATE;
-import static java.lang.reflect.Modifier.STATIC;
+import static java.lang.reflect.Modifier.*;
+;
 
 /**
  * Generates a <strong>D</strong>alvik <strong>EX</strong>ecutable (dex)
@@ -231,7 +231,7 @@ TypeDeclaration getTypeDeclaration(TypeId<?> type) {
      *     Modifier#FINAL} and {@link Modifier#ABSTRACT}.
      */
     public void declare(TypeId<?> type, String sourceFile, int flags,
-            TypeId<?> supertype, TypeId<?>... interfaces) {
+                        TypeId<?> supertype, TypeId<?>... interfaces) {
         TypeDeclaration declaration = getTypeDeclaration(type);
         int supportedFlags = Modifier.PUBLIC | Modifier.FINAL | Modifier.ABSTRACT
                 | AccessFlags.ACC_SYNTHETIC;
@@ -266,7 +266,7 @@ public Code declare(MethodId<?, ?> method, int flags) {
             throw new IllegalStateException("already declared: " + method);
         }
 
-        int supportedFlags = Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED
+        int supportedFlags = Modifier.ABSTRACT | Modifier.NATIVE | Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED
                 | Modifier.STATIC | Modifier.FINAL | Modifier.SYNCHRONIZED
                 | AccessFlags.ACC_SYNTHETIC | AccessFlags.ACC_BRIDGE;
         if ((flags & ~supportedFlags) != 0) {
@@ -529,9 +529,9 @@ public ClassLoader generateAndLoad(ClassLoader parent, File dexCache) throws IOE
          * TODO: load the dex from memory where supported.
          */
         result.createNewFile();
-        
+
         JarOutputStream jarOut =
-            new JarOutputStream(new BufferedOutputStream(new FileOutputStream(result)));
+                new JarOutputStream(new BufferedOutputStream(new FileOutputStream(result)));
         try {
             JarEntry entry = new JarEntry(DexFormat.DEX_IN_JAR_NAME);
             entry.setSize(dex.length);
@@ -544,7 +544,7 @@ public ClassLoader generateAndLoad(ClassLoader parent, File dexCache) throws IOE
         } finally {
             jarOut.close();
         }
-        
+
         return generateClassLoader(result, dexCache, parent);
     }
 
@@ -655,6 +655,10 @@ boolean isDirect() {
         }
 
         EncodedMethod toEncodedMethod(DexOptions dexOptions) {
+            if((flags & ABSTRACT) != 0 || (flags & NATIVE) != 0){
+                return new EncodedMethod(method.constant, flags, null, StdTypeList.EMPTY);
+            }
+
             RopMethod ropMethod = new RopMethod(code.toBasicBlocks(), 0);
             LocalVariableInfo locals = null;
             DalvCode dalvCode = RopTranslator.translate(
