Fixing JPF for methodMissing() method in Groovy: 1) Bug in detecting the array type...

diff --git a/examples/Reflection.java b/examples/Reflection.java
index e48689033dcff6b4f426824afdd9c6eee482ad3a..801940e9e7e2c54e79b087ecd138e738bbff9046 100644 (file)
--- a/examples/Reflection.java
+++ b/examples/Reflection.java
@@ -12,6 +12,8 @@ import java.util.Collection;
 import java.math.BigInteger;
 import java.security.ProtectionDomain;
 
+import java.beans.Introspector;
+
 public class Reflection {
 
     interface GenericSuperShort<XYZ> {
@@ -52,14 +54,22 @@ public class Reflection {
           }*/
        }
 
-   public static void main(String[] args) {
+   public static void main(String[] args) throws Exception {
           
          //BigInteger bi = new BigInteger("-1");
          //System.out.println(bi);
-         StringBuilder sb = new StringBuilder(0);
+         /*StringBuilder sb = new StringBuilder(0);
          sb.append('[');
          sb.append(']');
-         System.out.println(sb.toString());
+         System.out.println(sb.toString());*/
+         
+         //Class cls = Class.forName("groovy.runtime.metaclass.Logger.LoggerMetaClass");
+         //Class cls2 = Class.forName("groovy.runtime.metaclass.[Ljava.lang.Object;MetaClass");
+         //Class cls2 = Class.forName("[Ljava.lang.Object;BeanInfo");
+         Class cls = Object[].class;
+         System.out.println("Bean introspection do not ignore bean info: " + cls.getSimpleName());
+         System.out.println("Bean introspection do not ignore bean info: " + cls.getName());
+      Object obj = Introspector.getBeanInfo(cls);
           
          /* TODO: Enumerate all methods in Class.class
       Method[] methods = Collection.class.getMethods();

diff --git a/examples/SunClassLoader.java b/examples/SunClassLoader.java
index 195c3a6e84fc369005cb6e63c31db352b33c18e6..7d022c65a9a15ccac930e3d3ed1ac47b7307ef0d 100644 (file)
--- a/examples/SunClassLoader.java
+++ b/examples/SunClassLoader.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
  * Special class loader, which when running on Sun VM allows to generate accessor classes for any method
  */
 public class SunClassLoader extends ClassLoader implements Opcodes {
+
     private void loadMagic() {
         ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         cw.visit(Opcodes.V1_4, Opcodes.ACC_PUBLIC, "sun/reflect/GroovyMagic", null, "sun/reflect/MagicAccessorImpl", null);
@@ -34,5 +35,7 @@ public class SunClassLoader extends ClassLoader implements Opcodes {
     public static void main(String[] args) {
         SunClassLoader sun = new SunClassLoader();
         sun.loadMagic();
+        
+        Class cls = sun.loadClass("java/lang/Object");
     }
 }

diff --git a/src/main/gov/nasa/jpf/vm/ClassInfo.java b/src/main/gov/nasa/jpf/vm/ClassInfo.java
index abc9499818e31ba264210cfbfdf7dd9341e178b9..3ff7ca6ca7c6d13a72e7dd1b551031168872f621 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/ClassInfo.java
+++ b/src/main/gov/nasa/jpf/vm/ClassInfo.java
@@ -1813,6 +1813,12 @@ public class ClassInfo extends InfoObject implements Iterable<MethodInfo>, Gener
   public static boolean isBuiltinClass (String cname) {
     char c = cname.charAt(0);
 
+    // TODO: Fix for Groovy's model-checking
+    // TODO: Handling impossible names in Groovy, e.g., [Ljava.lang.Object;BeanInfo
+    if (cname.indexOf(';') != -1 && cname.indexOf(';') != cname.length() - 1) {
+      return false;
+    }
+
     // array class
     if ((c == '[') || cname.endsWith("[]")) {
       return true;

diff --git a/src/main/gov/nasa/jpf/vm/Types.java b/src/main/gov/nasa/jpf/vm/Types.java
index 981ac10df0fc4c917a6e0b17d031645559f4bb36..2f1cc999c85732e9dec9717e1115744115ed3078 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/Types.java
+++ b/src/main/gov/nasa/jpf/vm/Types.java
@@ -769,7 +769,8 @@ public class Types {
       return typeName;
     }
     
-    int i=typeName.indexOf('[');
+       // TODO: Fix for Groovy's model-checking
+    int i=typeName.indexOf("[]");
     if (i>0){ // the sort of "<type>[]"
       StringBuilder sb = new StringBuilder();
       sb.append('[');

diff --git a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
index 25a1dcf1afb58efe08e48687189ce4d9a1f55317..f6eb53da9107e9c4da02e1eafc46f908a1f86273 100644 (file)
--- a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
+++ b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
@@ -112,13 +112,18 @@ public class JPF_java_lang_ClassLoader extends NativePeer {
   public int findSystemClass__Ljava_lang_String_2__Ljava_lang_Class_2 (MJIEnv env, int objRef, int nameRef) {
     String cname = env.getStringObject(nameRef);
 
-    checkForIllegalName(env, cname);
-    if(env.hasException()) {
-      return MJIEnv.NULL;
-    }
-
     ClassLoaderInfo cl = ClassLoaderInfo.getCurrentSystemClassLoader();
 
+    // TODO: Fix for Groovy's model-checking
+    // Get a clean class name and try to resolve
+    ClassInfo cir = cl.getAlreadyResolvedClassInfo(Types.getClassNameFromTypeName(cname));
+    if (cir != null) {
+      checkForIllegalName(env, cname);
+      if(env.hasException()) {
+        return MJIEnv.NULL;
+      }
+    }
+
     ClassInfo ci = cl.getResolvedClassInfo(cname);
 
     if(!ci.isRegistered()) {
@@ -210,6 +215,7 @@ public class JPF_java_lang_ClassLoader extends NativePeer {
     }
 
     if((name.indexOf('/') != -1) || (name.charAt(0) == '[')) {
+      //env.throwException("java.lang.ClassNotFoundException", "IllegalName: " + name);
       env.throwException("java.lang.NoClassDefFoundError", "IllegalName: " + name);
     }
   }