diff options
| author | Geoffrey Keating <geoffk@redhat.com> | 2002-06-04 07:11:05 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2002-06-04 07:11:05 +0000 |
| commit | e2500fedef1a1c5b9e818fd1e2c281adff80df4a (patch) | |
| tree | 720630adca0f6b357e05c4feb8cbe33d556925ce /gcc/java/check-init.c | |
| parent | c2ae66169b8326bbf9b1dfa63083d2560fea7ddf (diff) | |
| download | gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.zip gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.gz gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.bz2 | |
Merge from pch-branch up to tag pch-commit-20020603.
From-SVN: r54232
Diffstat (limited to 'gcc/java/check-init.c')
| -rw-r--r-- | gcc/java/check-init.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c index 6793533..e022376 100644 --- a/gcc/java/check-init.c +++ b/gcc/java/check-init.c @@ -607,8 +607,10 @@ check_init (exp, before) if (fndecl && METHOD_STATIC (fndecl) && (DECL_INITIAL (decl) == boolean_true_node || (index >= 0 && ASSIGNED_P (tmp, index)))) - hash_lookup (&DECL_FUNCTION_INITIALIZED_CLASS_TABLE (fndecl), - DECL_FUNCTION_INIT_TEST_CLASS(decl), TRUE, NULL); + *(htab_find_slot + (DECL_FUNCTION_INITIALIZED_CLASS_TABLE (fndecl), + DECL_FUNCTION_INIT_TEST_CLASS (decl), INSERT)) = + DECL_FUNCTION_INIT_TEST_CLASS (decl); } DECL_BIT_INDEX (decl) = -1; } @@ -999,27 +1001,3 @@ check_for_initialization (body, mdecl) start_current_locals = num_current_locals = 0; } - -/* Call for every element in DECL_FUNCTION_INITIALIZED_CLASS_TABLE of - a method to consider whether the type indirectly described by ENTRY - is definitly initialized and thus remembered as such. */ - -bool -attach_initialized_static_class (entry, ptr) - struct hash_entry *entry; - PTR ptr; -{ - struct init_test_hash_entry *ite = (struct init_test_hash_entry *) entry; - tree fndecl = DECL_CONTEXT (ite->init_test_decl); - int index = DECL_BIT_INDEX (ite->init_test_decl); - - /* If the initializer flag has been definitly assigned (not taking - into account its first mandatory assignment which has been - already added but escaped analysis.) */ - if (fndecl && METHOD_STATIC (fndecl) - && (DECL_INITIAL (ite->init_test_decl) == boolean_true_node - || (index >= 0 && ASSIGNED_P (((word *) ptr), index)))) - hash_lookup (&DECL_FUNCTION_INITIALIZED_CLASS_TABLE (fndecl), - entry->key, TRUE, NULL); - return true; -} |