diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b156e0ce28d6d9cacb43445db3162adb5892feb1..44447d43c684d098b61654f40d1204d8ee46f2b6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,25 @@
+2005-03-17 Andrew Haley <aph@redhat.com>
+
+ * java/lang/natVMSecurityManager.cc (getClassContext): Add new
+ arg: klass.
+ Pass klass to _Jv_StackTrace::GetClassContext().
+ * java/lang/ClassLoader.java (getParent): Pass class to
+ VMSecurityManager.getClassContext()
+ (getSystemClassLoader): Likewise.
+ * java/lang/Package.java (getPackage): Likewise.
+ (getPackages): Likewise.
+ * java/lang/SecurityManager.java (getClassContext): Likewise.
+ (currentClassLoader): Likewise.
+ * java/lang/VMSecurityManager.java: (getClassContext): Likewise.
+ (currentClassLoader) Add new arg: caller.
+ Pass caller to VMSecurityManager.getClassContext.
+
+ * stacktrace.cc (GetClassContext): Correct calculation of
+ jframe_count.
+
+ * boehm.cc (_Jv_MarkObj): (_Jv_MarkObj): Mark
+ im->source_file_name.
+
2005-03-16 Andrew Haley <aph@redhat.com>
* boehm.cc (_Jv_MarkObj): Mark the interpreted method line_table.
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 45b94731d1554f827801637a54f8c179e643954c..2e64b1ca6cce5806f11c215f9a2de25be9bef49d 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -248,6 +248,9 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void *env)
p = (GC_PTR) ic->interpreted_methods;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic);
+ p = (GC_PTR) ic->source_file_name;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic);
+
for (int i = 0; i < c->method_count; i++)
{
// The interpreter installs a heap-allocated trampoline
diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java
index 2621281273f83e46ec31f2eca601a62b4d4b78fd..f2beaac97f672dc6e26595a7ff9186f92c074338 100644
--- a/libjava/java/lang/ClassLoader.java
+++ b/libjava/java/lang/ClassLoader.java
@@ -486,7 +486,7 @@ public abstract class ClassLoader
SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
- Class c = VMSecurityManager.getClassContext()[1];
+ Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1];
ClassLoader cl = c.getClassLoader();
if (cl != null && ! cl.isAncestorOf(this))
sm.checkPermission(new RuntimePermission("getClassLoader"));
@@ -729,7 +729,7 @@ public abstract class ClassLoader
SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
- Class c = VMSecurityManager.getClassContext()[1];
+ Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1];
ClassLoader cl = c.getClassLoader();
if (cl != null && cl != systemClassLoader)
sm.checkPermission(new RuntimePermission("getClassLoader"));
diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java
index 29b42b63cf12a92d09aef78f627dfe6858d25711..bddb370f1e7d5aee0c7d373d6eb60b78ef1c4a52 100644
--- a/libjava/java/lang/Package.java
+++ b/libjava/java/lang/Package.java
@@ -273,7 +273,7 @@ public class Package
public static Package getPackage(String name)
{
// Get the caller's classloader
- ClassLoader cl = VMSecurityManager.currentClassLoader();
+ ClassLoader cl = VMSecurityManager.currentClassLoader(Package.class);
return cl != null ? cl.getPackage(name) : VMClassLoader.getPackage(name);
}
@@ -286,7 +286,7 @@ public class Package
public static Package[] getPackages()
{
// Get the caller's classloader
- Class c = VMSecurityManager.getClassContext()[1];
+ Class c = VMSecurityManager.getClassContext(Package.class)[1];
ClassLoader cl = c.getClassLoader();
return cl != null ? cl.getPackages() : VMClassLoader.getPackages();
}
diff --git a/libjava/java/lang/SecurityManager.java b/libjava/java/lang/SecurityManager.java
index c9ed4be0b3f772f3e5540a65131d762a9b5fcb93..350439e0c3dd957fc46ec559a8bdd36eac2d549f 100644
--- a/libjava/java/lang/SecurityManager.java
+++ b/libjava/java/lang/SecurityManager.java
@@ -167,7 +167,7 @@ public class SecurityManager
*/
protected Class[] getClassContext()
{
- return VMSecurityManager.getClassContext();
+ return VMSecurityManager.getClassContext(SecurityManager.class);
}
/**
@@ -189,7 +189,7 @@ public class SecurityManager
*/
protected ClassLoader currentClassLoader()
{
- return VMSecurityManager.currentClassLoader();
+ return VMSecurityManager.currentClassLoader(SecurityManager.class);
}
/**
diff --git a/libjava/java/lang/VMSecurityManager.java b/libjava/java/lang/VMSecurityManager.java
index 604f8ecb428eb3ea4285f2090cb7a3983b65a745..f995ec89cf47cecf48bac3e2b9a42cb547e448cd 100644
--- a/libjava/java/lang/VMSecurityManager.java
+++ b/libjava/java/lang/VMSecurityManager.java
@@ -43,19 +43,19 @@ class VMSecurityManager
** @return an array containing all the methods on classes
** on the Java execution stack.
**/
- static native Class[] getClassContext();
+ static native Class[] getClassContext(Class caller);
/** Get the current ClassLoader--the one nearest to the
** top of the stack.
** @return the current ClassLoader.
**/
- static ClassLoader currentClassLoader()
+ static ClassLoader currentClassLoader(Class caller)
{
// The docs above are wrong. See the online docs.
// FIXME this implementation is a bit wrong too -- the docs say we
// must also consider ancestors of the system class loader.
ClassLoader systemClassLoader = VMClassLoader.getSystemClassLoader();
- Class[] classStack = getClassContext ();
+ Class[] classStack = getClassContext (caller);
for (int i = 0; i < classStack.length; i++)
{
ClassLoader loader = classStack[i].getClassLoader();
diff --git a/libjava/java/lang/natVMSecurityManager.cc b/libjava/java/lang/natVMSecurityManager.cc
index d55b7a54c3a938e5f2513aed49d8462fd69f0436..9d52c92c7c58d8fb0631edd085a6c58a26cb31a3 100644
--- a/libjava/java/lang/natVMSecurityManager.cc
+++ b/libjava/java/lang/natVMSecurityManager.cc
@@ -20,10 +20,10 @@ details. */
#include <java/lang/Class.h>
JArray<jclass> *
-java::lang::VMSecurityManager::getClassContext ()
+java::lang::VMSecurityManager::getClassContext (jclass klass)
{
JArray<jclass> *result =
- _Jv_StackTrace::GetClassContext (&SecurityManager::class$);
+ _Jv_StackTrace::GetClassContext (klass);
return result;
}
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index 6484dc6008d96ffaad605c213faaa6b1abe052fc..583b11a796c3075cc29f661e6db5d17e7d5c789e 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -464,19 +464,17 @@ _Jv_StackTrace::GetClassContext (jclass checkClass)
_Jv_StackFrame *frame = &state.frames[i];
FillInFrameInfo (frame);
- if (seen_checkClass
- && frame->klass
- && frame->klass != checkClass)
+ if (seen_checkClass)
{
- jframe_count++;
- if (start_pos == -1)
- start_pos = i;
+ if (frame->klass)
+ {
+ jframe_count++;
+ if (start_pos == -1)
+ start_pos = i;
+ }
}
-
- if (!seen_checkClass
- && frame->klass
- && frame->klass == checkClass)
- seen_checkClass = true;
+ else
+ seen_checkClass = frame->klass == checkClass;
}
result = (JArray<jclass> *) _Jv_NewObjectArray (jframe_count, &Class::class$, NULL);
int pos = 0;