git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

defineclass.cc (MAJOR_1_7, MINOR_1_7): New. 

2012-04-23  Andrew Haley  <aph@redhat.com>

	* defineclass.cc (MAJOR_1_7,  MINOR_1_7): New.
	(parse): Allow MAJOR_1_7 classfile version.

From-SVN: r186707
This commit is contained in:
Andrew Haley 2012-04-23 13:33:32 +00:00 committed by Andrew Haley
parent c654217566
commit 492eaa8dcf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-23 Andrew Haley <aph@redhat.com>
* defineclass.cc (MAJOR_1_7, MINOR_1_7): New.
(parse): Allow MAJOR_1_7 classfile version.
2012-04-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2012-04-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libgcj/52645 PR libgcj/52645

6
libjava/defineclass.cc
View File

@ -361,6 +361,8 @@ _Jv_DefineClass (jclass klass, jbyteArray data, jint offset, jint length,
#define MINOR_1_5 0 #define MINOR_1_5 0
#define MAJOR_1_6 50 #define MAJOR_1_6 50
#define MINOR_1_6 0 #define MINOR_1_6 0
#define MAJOR_1_7 51
#define MINOR_1_7 0
void void
_Jv_ClassReader::parse () _Jv_ClassReader::parse ()
@ -371,8 +373,8 @@ _Jv_ClassReader::parse ()
int minor_version = read2u (); int minor_version = read2u ();
int major_version = read2u (); int major_version = read2u ();
if (major_version < MAJOR_1_1 || major_version > MAJOR_1_6 if (major_version < MAJOR_1_1 || major_version > MAJOR_1_7
|| (major_version == MAJOR_1_6 && minor_version > MINOR_1_6)) || (major_version == MAJOR_1_7 && minor_version > MINOR_1_7))
throw_class_format_error ("unrecognized class file version"); throw_class_format_error ("unrecognized class file version");
is_15 = (major_version >= MAJOR_1_5); is_15 = (major_version >= MAJOR_1_5);