From 9bd9b9fcc1623ca3b6c98cb7ce12f31581750372 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 15 Jan 2010 18:00:51 +0000
Subject: Fix for #2365.

a soft reference around cached classes so they do not interfere with
garbage collection. There is a test case, but it is in pending because I
spent longer trying to get it to fail under partest than I did writing
the actual patch. If you would like to see the behavior which was
corrected, go to

  test/pending/run/bug2365

and run that script with scalac built before and after this commit.
Review by dubochet.
---
 test/pending/run/bug2365/Test.scala       | 35 +++++++++++++++++++++++++++++++
 test/pending/run/bug2365/bug2365.javaopts |  1 +
 test/pending/run/bug2365/run              | 13 ++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 test/pending/run/bug2365/Test.scala
 create mode 100644 test/pending/run/bug2365/bug2365.javaopts
 create mode 100755 test/pending/run/bug2365/run

(limited to 'test')

diff --git a/test/pending/run/bug2365/Test.scala b/test/pending/run/bug2365/Test.scala
new file mode 100644
index 0000000000..92b58f4a25
--- /dev/null
+++ b/test/pending/run/bug2365/Test.scala
@@ -0,0 +1,35 @@
+import scala.tools.nsc.io._
+import java.net.URL
+
+object A { def apply(d: { def apply(): Int}) = d.apply() }
+object A2 { def apply(d: { def apply(): Int}) = d.apply() }
+object A3 { def apply(d: { def apply(): Int}) = d.apply() }
+object A4 { def apply(d: { def apply(): Int}) = d.apply() }
+
+class B extends Function0[Int] {
+	def apply() = 3
+}
+
+object Test
+{
+  type StructF0 = { def apply(): Int }
+	def main(args: Array[String]) {
+		for(i <- 0 until 150)
+			println(i + " " + test(A.apply) + " " + test(A2.apply) + " " + test(A3.apply) + " " + test(A3.apply))
+	}
+
+	def test(withF0: StructF0 => Int): Int = {
+	  // Some large jar
+	  val ivyJar = File("/local/lib/java/ivy.jar").toURL
+	  // load a class in a separate loader that will be passed to A
+	  val loader = new java.net.URLClassLoader(Array(File(".").toURL, ivyJar))
+	  // load a real class to fill perm gen space
+    Class.forName("org.apache.ivy.Ivy", true, loader).newInstance
+    // create a class from another class loader with an apply: Int method
+  	val b = Class.forName("B", true, loader).newInstance
+
+		// pass instance to a, which will call apply using structural type reflection.
+		// This should hold on to the class for B, which means bLoader will not get collected
+	  withF0(b.asInstanceOf[StructF0])
+	}
+}
diff --git a/test/pending/run/bug2365/bug2365.javaopts b/test/pending/run/bug2365/bug2365.javaopts
new file mode 100644
index 0000000000..357e033c1c
--- /dev/null
+++ b/test/pending/run/bug2365/bug2365.javaopts
@@ -0,0 +1 @@
+-XX:MaxPermSize=25M
diff --git a/test/pending/run/bug2365/run b/test/pending/run/bug2365/run
new file mode 100755
index 0000000000..f3c44ad086
--- /dev/null
+++ b/test/pending/run/bug2365/run
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This script should fail with any build of scala where #2365
+# is not fixed, and otherwise succeed.  Failure means running out
+# of PermGen space.
+
+CP=.:/local/lib/java/ivy.jar
+# SCALAC=/scala/inst/28/bin/scalac
+SCALAC=scalac
+RUN_OPTS="-XX:MaxPermSize=25M -verbose:gc"
+
+$SCALAC -cp $CP *.scala
+JAVA_OPTS="${RUN_OPTS}" scala -cp $CP Test
-- 
cgit v1.2.3