From 0e64e323b0a71f96919613619e2dd4176226d653 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 22 Sep 2004 10:51:42 +0000 Subject: [PATCH] vec.h (VEC_space): Return true if there _is_ space. * vec.h (VEC_space): Return true if there _is_ space. (VEC_reserve): Adjust. * java/parse.y (patch_anonymous_class): VEC_space returns true if there is space. From-SVN: r87852 --- gcc/ChangeLog | 5 +++++ gcc/java/ChangeLog | 5 +++++ gcc/java/parse.y | 2 +- gcc/vec.h | 8 ++++---- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dce40399ab2..01e949c7de1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-09-22 Nathan Sidwell + + * vec.h (VEC_space): Return true if there _is_ space. + (VEC_reserve): Adjust. + 2004-09-22 Richard Sandiford * config/mips/mips.c (mips_function_value): For o32, o64, n32 and n64, diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 0d705828e32..94bbe670ffa 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2004-09-22 Nathan Sidwell + + * parse.y (patch_anonymous_class): VEC_space returns true if there + is space. + 2004-09-21 Matt Austern Fix bootstrap. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 377c195323b..b221a4c9f59 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -3904,7 +3904,7 @@ patch_anonymous_class (tree type_decl, tree class_decl, tree wfl) if (parser_check_super_interface (type_decl, class_decl, wfl)) return; - if (VEC_space (tree, BINFO_BASE_BINFOS (binfo), 1)) + if (!VEC_space (tree, BINFO_BASE_BINFOS (binfo), 1)) { /* Extend the binfo - by reallocating and copying it. */ tree new_binfo; diff --git a/gcc/vec.h b/gcc/vec.h index 3e272d40c47..3ab775d1f3b 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -452,13 +452,13 @@ static inline int VEC_OP (TDEF,space) \ (VEC (TDEF) *vec_, int alloc_) \ { \ return vec_ ? ((vec_)->alloc - (vec_)->num \ - < (unsigned)(alloc_ < 0 ? 1 : alloc_)) : alloc_ != 0; \ + >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \ } \ \ static inline int VEC_OP (TDEF,reserve) \ (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \ { \ - int extend = VEC_OP (TDEF,space) (*vec_, alloc_); \ + int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \ \ if (extend) \ *vec_ = (VEC (TDEF) *) vec_##a##_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \ @@ -683,13 +683,13 @@ static inline int VEC_OP (TDEF,space) \ (VEC (TDEF) *vec_, int alloc_) \ { \ return vec_ ? ((vec_)->alloc - (vec_)->num \ - < (unsigned)(alloc_ < 0 ? 1 : alloc_)) : alloc_ != 0; \ + >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \ } \ \ static inline int VEC_OP (TDEF,reserve) \ (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \ { \ - int extend = VEC_OP (TDEF,space) (*vec_, alloc_); \ + int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \ \ if (extend) \ *vec_ = (VEC (TDEF) *) vec_##a##_o_reserve (*vec_, alloc_, \ -- 2.30.2