(The patch contained impurities -- this should fix the situation.)

From-SVN: r33591
parent 7aa88bcf
...@@ -7297,19 +7297,9 @@ java_complete_expand_methods (class_decl) ...@@ -7297,19 +7297,9 @@ java_complete_expand_methods (class_decl)
/* First, do the ordinary methods. */ /* First, do the ordinary methods. */
for (decl = first_decl; decl; decl = TREE_CHAIN (decl)) for (decl = first_decl; decl; decl = TREE_CHAIN (decl))
{ {
/* Skip abstract or native methods -- but do handle native /* Skip abstract or native methods */
methods when generating JNI stubs. */ if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl))
if (METHOD_ABSTRACT (decl)
|| (! flag_jni && METHOD_NATIVE (decl))
|| DECL_CONSTRUCTOR_P (decl) || DECL_CLINIT_P (decl))
continue; continue;
if (METHOD_NATIVE (decl))
{
tree body = build_jni_stub (decl);
BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (decl)) = body;
}
java_complete_expand_method (decl); java_complete_expand_method (decl);
} }
...@@ -7439,7 +7429,7 @@ java_complete_expand_method (mdecl) ...@@ -7439,7 +7429,7 @@ java_complete_expand_method (mdecl)
{ {
block_body = java_complete_tree (block_body); block_body = java_complete_tree (block_body);
if (! flag_emit_xref && ! METHOD_NATIVE (mdecl)) if (!flag_emit_xref)
check_for_initialization (block_body); check_for_initialization (block_body);
ctxp->explicit_constructor_p = 0; ctxp->explicit_constructor_p = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment