commit c66c077d40db58ec239f93a9c42b9939439c85c7
author Nicolas Geoffray <ngeoffray@google.com> Tue Jan 10 08:59:31 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jan 10 08:59:31 2017 +0000
tree 4b4c7a269d3e4daff108960d13f23d8e693e8396
parent b4e51ebfa23a1cb175a6c317ac4a69228709e78f

Revert "Add basic implementation of IsModifiableClass"

Built on top of a failing change.

This reverts commit b4e51ebfa23a1cb175a6c317ac4a69228709e78f.

Change-Id: I7f4dbe22271a9c04e518bceabba12c95cad3c6f7

test/912-classes/classes.cc

diff --git a/test/912-classes/classes.cc b/test/912-classes/classes.cc
index 38a4f0e..19d82c5 100644
--- a/test/912-classes/classes.cc
+++ b/test/912-classes/classes.cc
@@ -29,20 +29,6 @@
 namespace art {
 namespace Test912Classes {
 
-extern "C" JNIEXPORT jboolean JNICALL Java_Main_isModifiableClass(
-    JNIEnv* env ATTRIBUTE_UNUSED, jclass Main_klass ATTRIBUTE_UNUSED, jclass klass) {
-  jboolean res = JNI_FALSE;
-  jvmtiError result = jvmti_env->IsModifiableClass(klass, &res);
-  if (result != JVMTI_ERROR_NONE) {
-    char* err;
-    jvmti_env->GetErrorName(result, &err);
-    printf("Failure running IsModifiableClass: %s\n", err);
-    jvmti_env->Deallocate(reinterpret_cast<unsigned char*>(err));
-    return JNI_FALSE;
-  }
-  return res;
-}
-
 extern "C" JNIEXPORT jobjectArray JNICALL Java_Main_getClassSignature(
     JNIEnv* env, jclass Main_klass ATTRIBUTE_UNUSED, jclass klass) {
   char* sig;

test/912-classes/expected.txt

diff --git a/test/912-classes/expected.txt b/test/912-classes/expected.txt
index 44c861a..3507a1a 100644
--- a/test/912-classes/expected.txt
+++ b/test/912-classes/expected.txt
@@ -12,13 +12,13 @@
 411
 [[D, null]
 411
-int interface=false array=false modifiable=false
-$Proxy0 interface=false array=false modifiable=false
-java.lang.Runnable interface=true array=false modifiable=false
-java.lang.String interface=false array=false modifiable=true
-[I interface=false array=true modifiable=false
-[Ljava.lang.Runnable; interface=false array=true modifiable=false
-[Ljava.lang.String; interface=false array=true modifiable=false
+int interface=false array=false
+$Proxy0 interface=false array=false
+java.lang.Runnable interface=true array=false
+java.lang.String interface=false array=false
+[I interface=false array=true
+[Ljava.lang.Runnable; interface=false array=true
+[Ljava.lang.String; interface=false array=true
 [public static final int java.lang.Integer.BYTES, static final char[] java.lang.Integer.DigitOnes, static final char[] java.lang.Integer.DigitTens, public static final int java.lang.Integer.MAX_VALUE, public static final int java.lang.Integer.MIN_VALUE, public static final int java.lang.Integer.SIZE, private static final java.lang.String[] java.lang.Integer.SMALL_NEG_VALUES, private static final java.lang.String[] java.lang.Integer.SMALL_NONNEG_VALUES, public static final java.lang.Class java.lang.Integer.TYPE, static final char[] java.lang.Integer.digits, private static final long java.lang.Integer.serialVersionUID, static final int[] java.lang.Integer.sizeTable, private final int java.lang.Integer.value]
 []
 []

test/912-classes/src/Main.java

diff --git a/test/912-classes/src/Main.java b/test/912-classes/src/Main.java
index e627d42..69e5a4c 100644
--- a/test/912-classes/src/Main.java
+++ b/test/912-classes/src/Main.java
@@ -107,9 +107,7 @@
   private static void testClassType(Class<?> c) throws Exception {
     boolean isInterface = isInterface(c);
     boolean isArray = isArrayClass(c);
-    boolean isModifiable = isModifiableClass(c);
-    System.out.println(c.getName() + " interface=" + isInterface + " array=" + isArray +
-        " modifiable=" + isModifiable);
+    System.out.println(c.getName() + " interface=" + isInterface + " array=" + isArray);
   }
 
   private static void testClassFields(Class<?> c) throws Exception {
@@ -151,7 +149,6 @@
     }
   }
 
-  private static native boolean isModifiableClass(Class<?> c);
   private static native String[] getClassSignature(Class<?> c);
 
   private static native boolean isInterface(Class<?> c);