aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2007-03-05 11:33:46 +0000
committerAndrew Haley <aph@gcc.gnu.org>2007-03-05 11:33:46 +0000
commit39cd07dfc783fb94ef0ff99a4e2a5e70b8120d90 (patch)
tree5c07659bf2f102db63611ab48824f54f174710de
parentf9be04cd95886e9e04213131469f9fb2c62a9d87 (diff)
downloadgcc-39cd07dfc783fb94ef0ff99a4e2a5e70b8120d90.zip
gcc-39cd07dfc783fb94ef0ff99a4e2a5e70b8120d90.tar.gz
gcc-39cd07dfc783fb94ef0ff99a4e2a5e70b8120d90.tar.bz2
natClass.cc (parseAnnotationElement): Correct long annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double.
2007-03-03 Andrew Haley <aph@redhat.com> * java/lang/natClass.cc (parseAnnotationElement): Correct long annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double. From-SVN: r122545
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natClass.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bddc998..c595a22 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-03 Andrew Haley <aph@redhat.com>
+
+ * java/lang/natClass.cc (parseAnnotationElement): Correct long
+ annotations to read JV_CONSTANT_Long, not JV_CONSTANT_Double.
+
2007-03-02 Andrew Haley <aph@redhat.com>
* sun/reflect/annotation/AnnotationInvocationHandler.java:
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index ea55546..078f842 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -1150,7 +1150,7 @@ parseAnnotationElement(jclass klass, _Jv_Constants *pool,
case 'J':
{
int cindex = read_u2 (bytes, last);
- check_constant (pool, cindex, JV_CONSTANT_Double);
+ check_constant (pool, cindex, JV_CONSTANT_Long);
_Jv_word2 word;
memcpy (&word, &pool->data[cindex], 2 * sizeof (_Jv_word));
result = Long::valueOf (word.l);