From 0ed431d48446d901139127e3ce9dc894f0ced6c8 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Thu, 13 Jul 2006 14:19:04 +0000 Subject: [PATCH] builtins.c (check_for_builtin): If a builtin could result in a direct call being generated... 2006-07-12 Bryce McKinlay * builtins.c (check_for_builtin): If a builtin could result in a direct call being generated, don't use it if flag_indirect_dispatch is set. From-SVN: r115414 --- gcc/java/ChangeLog | 10 ++++++++++ gcc/java/builtins.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index f923536dc01..786d43d3a20 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,13 @@ +2006-07-12 Bryce McKinlay + + * builtins.c (check_for_builtin): If a builtin could result in a + direct call being generated, don't use it if flag_indirect_dispatch + is set. + +2006-07-12 Bryce McKinlay + + * gcj.texi (Invocation): Corrections for Invocation API example. + 2006-07-04 Andrew Haley * class.c (build_fieldref_cache_entry): Set DECL_IGNORED_P on the diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index 86aa00f2bfd..77936395cbb 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -293,6 +293,11 @@ check_for_builtin (tree method, tree call) method_arguments); return result == NULL_TREE ? call : result; } + + /* Builtin functions emit a direct call which is incompatible + with the BC-ABI. */ + if (flag_indirect_dispatch) + return call; fn = built_in_decls[java_builtins[i].builtin_code]; if (fn == NULL_TREE) return call; -- 2.30.2