diff options
Diffstat (limited to 'gcc/java/jcf-reader.c')
| -rw-r--r-- | gcc/java/jcf-reader.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/java/jcf-reader.c b/gcc/java/jcf-reader.c index 1bd5299..da45cc9 100644 --- a/gcc/java/jcf-reader.c +++ b/gcc/java/jcf-reader.c @@ -264,8 +264,8 @@ jcf_parse_constant_pool (JCF* jcf) { int i, n; JPOOL_SIZE (jcf) = (JCF_FILL (jcf, 2), JCF_readu2 (jcf)); - jcf->cpool.tags = ALLOC (JPOOL_SIZE (jcf)); - jcf->cpool.data = ALLOC (sizeof (jword) * JPOOL_SIZE (jcf)); + jcf->cpool.tags = ggc_alloc (JPOOL_SIZE (jcf)); + jcf->cpool.data = ggc_alloc (sizeof (jword) * JPOOL_SIZE (jcf)); jcf->cpool.tags[0] = 0; #ifdef HANDLE_START_CONSTANT_POOL HANDLE_START_CONSTANT_POOL (JPOOL_SIZE (jcf)); @@ -285,25 +285,25 @@ jcf_parse_constant_pool (JCF* jcf) { case CONSTANT_String: case CONSTANT_Class: - jcf->cpool.data[i] = JCF_readu2 (jcf); + jcf->cpool.data[i].w = JCF_readu2 (jcf); break; case CONSTANT_Fieldref: case CONSTANT_Methodref: case CONSTANT_InterfaceMethodref: case CONSTANT_NameAndType: - jcf->cpool.data[i] = JCF_readu2 (jcf); - jcf->cpool.data[i] |= JCF_readu2 (jcf) << 16; + jcf->cpool.data[i].w = JCF_readu2 (jcf); + jcf->cpool.data[i].w |= JCF_readu2 (jcf) << 16; break; case CONSTANT_Integer: case CONSTANT_Float: - jcf->cpool.data[i] = JCF_readu4 (jcf); + jcf->cpool.data[i].w = JCF_readu4 (jcf); break; case CONSTANT_Long: case CONSTANT_Double: - jcf->cpool.data[i] = JCF_readu4 (jcf); + jcf->cpool.data[i].w = JCF_readu4 (jcf); i++; /* These take up two spots in the constant pool */ jcf->cpool.tags[i] = 0; - jcf->cpool.data[i] = JCF_readu4 (jcf); + jcf->cpool.data[i].w = JCF_readu4 (jcf); break; case CONSTANT_Utf8: n = JCF_readu2 (jcf); @@ -311,7 +311,7 @@ jcf_parse_constant_pool (JCF* jcf) #ifdef HANDLE_CONSTANT_Utf8 HANDLE_CONSTANT_Utf8(jcf, i, n); #else - jcf->cpool.data[i] = JCF_TELL(jcf) - 2; + jcf->cpool.data[i].w = JCF_TELL(jcf) - 2; JCF_SKIP (jcf, n); #endif break; |