Re: [BC ABI] For entertainment purposes only: gcj-JIT

[Andrew Haley <aph at redhat dot com>]

Tom Tromey writes:
 > >>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:
 > 
 > Tom> I've got a patch here to do this and some other minor cleanups I
 > Tom> wanted; I'm waiting for some comments on the VMCompiler thing
 > Tom> first (on classpath-patches), but meanwhile here it is.
 > 
 > I changed my mind... this is on the branch, and I will refactor if
 > need be, so I am just going to check it in so I can clear the decks
 > for the next round of changes.
 > 
 > Note that you now have to use properties, the environment variables
 > are gone.

   findClass (fileName)  ????

I think this must have been a brainfart.  :-)

Andrew.


2004-08-18  Andrew Haley  <aph@redhat.com>

	* java/lang/VMCompiler.java (loadSharedLibrary): Add className
	argument.  Pass it to findClass instead of fileName.
	(compileClass): Pass class name to loadSharedLibrary.

Index: java/lang/VMCompiler.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Attic/VMCompiler.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 VMCompiler.java
--- java/lang/VMCompiler.java   12 Aug 2004 17:58:15 -0000      1.1.2.1
+++ java/lang/VMCompiler.java   18 Aug 2004 15:16:33 -0000
@@ -100,12 +100,13 @@
 
   private static Class loadSharedLibrary(ClassLoader loader,
                                         String fileName,
-                                        ProtectionDomain domain)
+                                        ProtectionDomain domain,
+                                        String className)
   {
     Class c = null;
     SharedLibHelper helper 
       = SharedLibHelper.findHelper (loader, fileName, domain.getCodeSource());
-    c = helper.findClass (fileName);
+    c = helper.findClass (className);
     if (c != null)
       {
        HashSet hs = (HashSet) sharedHelperMap.get(loader);
@@ -149,7 +150,8 @@
        // via a property that determines lookup policy.
        File soFile = new File(hexBytes + ".so");
        if (soFile.isFile())
-         return loadSharedLibrary (loader, soFile.toString(), domain);
+          return loadSharedLibrary (loader, soFile.toString(), domain,
+                                   name);
 
        File classFile = new File(hexBytes + ".class");
        classFile.delete();
@@ -185,7 +187,7 @@
            return null;
          }
 
-       return loadSharedLibrary(loader, soFile.toString(), domain);
+       return loadSharedLibrary(loader, soFile.toString(), domain, name);
       }
     catch (Exception _)
       {