diff options
| author | Andrew Haley <aph@redhat.com> | 2007-02-02 16:34:17 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-02-02 16:34:17 +0000 |
| commit | b4e18eee4b56ed8d4003d1fb92acb5f7dbf43748 (patch) | |
| tree | 825931419e51fa7cc806a34c9dce994cb91d820f /gcc/java/decl.c | |
| parent | ad12460bed01fc26b69eaa8292986d19f6e24cb5 (diff) | |
| download | gcc-b4e18eee4b56ed8d4003d1fb92acb5f7dbf43748.zip gcc-b4e18eee4b56ed8d4003d1fb92acb5f7dbf43748.tar.gz gcc-b4e18eee4b56ed8d4003d1fb92acb5f7dbf43748.tar.bz2 | |
expr.c (expand_byte_code): Call cache_this_class_ref() and cache_cpool_data_ref().
2007-02-02 Andrew Haley <aph@redhat.com>
* expr.c (expand_byte_code): Call cache_this_class_ref() and
cache_cpool_data_ref().
Set TYPE_CPOOL_DATA_REF.
(cache_cpool_data_ref): New function.
* constants.c (build_ref_from_constant_pool): Remove special-case
code for flag_indirect_classes.
(build_constant_data_ref): Move special-case code for
flag_indirect_classes here from build_ref_from_constant_pool.
* decl.c (finish_method): Move class initialization from here to
cache_this_class_ref.
* class.c (cache_this_class_ref): New function.
(build_class_ref): Use this_classdollar for the ouput class.
From-SVN: r121508
Diffstat (limited to 'gcc/java/decl.c')
| -rw-r--r-- | gcc/java/decl.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c index fcf6353..e38c4bc 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1876,22 +1876,6 @@ finish_method (tree fndecl) build2 (TRY_FINALLY_EXPR, void_type_node, *tp, exit)); } - /* Prepend class initialization for static methods reachable from - other classes. */ - if (METHOD_STATIC (fndecl) - && (! METHOD_PRIVATE (fndecl) - || INNER_CLASS_P (DECL_CONTEXT (fndecl))) - && ! DECL_CLINIT_P (fndecl) - && ! CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (fndecl)))) - { - tree clas = DECL_CONTEXT (fndecl); - tree init = build3 (CALL_EXPR, void_type_node, - build_address_of (soft_initclass_node), - build_tree_list (NULL_TREE, build_class_ref (clas)), - NULL_TREE); - *tp = build2 (COMPOUND_EXPR, TREE_TYPE (*tp), init, *tp); - } - /* Convert function tree to GENERIC prior to inlining. */ java_genericize (fndecl); |