From b4bbc8b7d36cfb5eafb02814087504e074a00be5 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Mon, 25 Nov 2002 14:22:06 +0000 Subject: [PATCH] jcf-reader.c: Don't expand JCF_readu4 inside the expansion of JCF_SKIP. * jcf-reader.c: Don't expand JCF_readu4 inside the expansion of JCF_SKIP. From-SVN: r59459 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-reader.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9dd2e1e1f06..0ffb2e04c2e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2002-11-25 Diego Novillo + + * jcf-reader.c: Don't expand JCF_readu4 inside the + expansion of JCF_SKIP. + 2002-11-22 Tom Tromey * parse.y (patch_binop): Cast right hand side of shift expression diff --git a/gcc/java/jcf-reader.c b/gcc/java/jcf-reader.c index 5df7a2e6353..96e3463ac25 100644 --- a/gcc/java/jcf-reader.c +++ b/gcc/java/jcf-reader.c @@ -96,9 +96,11 @@ skip_attribute (jcf, number_of_attribute) { while (number_of_attribute--) { + JCF_u4 N; JCF_FILL (jcf, 6); (void) JCF_readu2 (jcf); - JCF_SKIP (jcf, JCF_readu4 (jcf)); + N = JCF_readu4 (jcf); + JCF_SKIP (jcf, N); } } #endif