/hg/icedtea6: JamVM: Fix regression introduced by; Intern string...

[xranby at icedtea.classpath.org]

changeset 79671aecc0b0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=79671aecc0b0
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Aug 15 14:29:30 2011 +0200

	JamVM: Fix regression introduced by; Intern strings when creating a
	StackTraceElement.

	2011-08-15 Xerxes Ranby <xerxes at zafena.se>

	 JamVM
		- Fix regression introduced by, Intern strings when creating a
	StackTraceElement, changeset
	4dbc2ee340a600fc17451dfbcfc09e1f9844fc59.
		* NEWS: Updated.
		* patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.pa
	tch: New patch.
		* Makefile.am: Apply JamVM patch.


diffstat:

 ChangeLog                                                               |   9 +++++++
 Makefile.am                                                             |   3 +-
 patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch |  12 ++++++++++
 3 files changed, 23 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 0e26a40dddf3 -r 79671aecc0b0 ChangeLog
--- a/ChangeLog	Mon Aug 15 12:08:18 2011 +0200
+++ b/ChangeLog	Mon Aug 15 14:29:30 2011 +0200
@@ -1,3 +1,12 @@
+2011-08-15  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	JamVM
+	- Fix regression introduced by,  Intern strings when creating a StackTraceElement,
+	  changeset 4dbc2ee340a600fc17451dfbcfc09e1f9844fc59.
+	* NEWS: Updated.
+	* patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch: New patch.
+	* Makefile.am: Apply JamVM patch.
+
 2011-08-15  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	JamVM
diff -r 0e26a40dddf3 -r 79671aecc0b0 Makefile.am
--- a/Makefile.am	Mon Aug 15 12:08:18 2011 +0200
+++ b/Makefile.am	Mon Aug 15 14:29:30 2011 +0200
@@ -398,7 +398,8 @@
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
         patches/jamvm/jmm_GetLongAttribute_201.patch \
-        patches/jamvm/ignore-assertions-and-verify-options.patch
+        patches/jamvm/ignore-assertions-and-verify-options.patch \
+	patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch
 endif
 
 if ENABLE_PULSE_JAVA
diff -r 0e26a40dddf3 -r 79671aecc0b0 patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch	Mon Aug 15 14:29:30 2011 +0200
@@ -0,0 +1,13 @@
+Index: jamvm/jamvm/src/excep.c
+===================================================================
+--- jamvm.orig/jamvm/src/excep.c	2011-08-15 14:19:32.757781965 +0200
++++ jamvm/jamvm/src/excep.c	2011-08-15 14:19:43.601836044 +0200
+@@ -311,7 +311,7 @@
+     executeMethod(ste, ste_init_mb,
+                   findInternedString(classname), 
+                   findInternedString(methodname), 
+-                  findInternedString(filename),
++                  filename,
+                   is_native ? -2 : mapPC2LineNo(mb, pc));
+ 
+     if(exceptionOccurred())