aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/verify-impl.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c4479f2..cedb5f9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-18 Ian Lance Taylor <iant@google.com>
+
+ * verify-impl.c (verify_instructions_0): Add cast to enum type.
+
2009-04-09 Paolo Bonzini <bonzini@gnu.org>
* builtins.c (compareAndSwapLong_builtin,
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index 2e69359..5c4de45 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009
Free Software Foundation
This file is part of libgcj.
@@ -3025,13 +3025,15 @@ verify_instructions_0 (void)
case op_newarray:
{
int atype = get_byte ();
+ vfy_jclass k;
type t;
/* We intentionally have chosen constants to make this
valid. */
if (atype < boolean_type || atype > long_type)
verify_fail_pc ("type not primitive", vfr->start_PC);
pop_type (int_type);
- init_type_from_class (&t, construct_primitive_array_type (atype));
+ k = construct_primitive_array_type ((type_val) atype);
+ init_type_from_class (&t, k);
push_type_t (t);
}
break;