Hi,
This patch moves a couple code duplications into its own routine, the
checkAction global parameter is now initialized and properly adjusted.
Bootstrapped and regression tested on x86_64-linux-gnu, and committed to
master.
Regards
Iain
gcc/d/ChangeLog:
* d-codegen.cc (build_array_bounds_call): New function.
(build_bounds_condition): Use build_array_bounds_call.
* d-lang.cc (d_init_options): Explicitly set default check action to
CHECKACTION_D.
(d_post_options): Set check action to CHECKACTION_C if the flag
-fno-druntime was seen.
* d-tree.h (build_array_bounds_call): Declare.
* expr.cc (ExprVisitor::visit (AssertExp *)): Use
build_array_bounds_call.
---
gcc/d/d-codegen.cc | 24 +++++++++++++++++++++---
gcc/d/d-lang.cc | 3 ++-
gcc/d/d-tree.h | 1 +
gcc/d/expr.cc | 4 +---
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index d31638e2c1d..9d13e1263a9 100644
--- a/gcc/d/d-codegen.cc
+++ b/gcc/d/d-codegen.cc
@@ -1712,6 +1712,26 @@ void_okay_p (tree t)
return t;
}
+/* Builds a CALL_EXPR at location LOC in the source file to execute when an
+ array bounds check fails. */
+
+tree
+build_array_bounds_call (const Loc &loc)
+{
+ switch (global.params.checkAction)
+ {
+ case CHECKACTION_D:
+ return d_assert_call (loc, LIBCALL_ARRAY_BOUNDS);
+
+ case CHECKACTION_C:
+ case CHECKACTION_halt:
+ return build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+
+ default:
+ gcc_unreachable ();
+ }
+}
+
/* Builds a bounds condition checking that INDEX is between 0 and LEN.
The condition returns the INDEX if true, or throws a RangeError.
If INCLUSIVE, we allow INDEX == LEN to return true also. */
@@ -1731,9 +1751,7 @@ build_bounds_condition (const Loc& loc, tree index, tree
len, bool inclusive)
tree condition = fold_build2 (inclusive ? GT_EXPR : GE_EXPR,
d_bool_type, index, len);
/* Terminate the program with a trap if no D runtime present. */
- tree boundserr = (global.params.checkAction == CHECKACTION_D)
- ? d_assert_call (loc, LIBCALL_ARRAY_BOUNDS)
- : build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+ tree boundserr = build_array_bounds_call (loc);
return build_condition (TREE_TYPE (index), condition, boundserr, index);
}
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 5266a6550dc..085d8393b5a 100644
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -285,6 +285,7 @@ d_init_options (unsigned int, cl_decoded_option
*decoded_options)
global.params.useOut = CHECKENABLEdefault;
global.params.useArrayBounds = CHECKENABLEdefault;
global.params.useSwitchError = CHECKENABLEdefault;
+ global.params.checkAction = CHECKACTION_D;
global.params.useModuleInfo = true;
global.params.useTypeInfo = true;
global.params.useExceptions = true;
@@ -775,7 +776,7 @@ d_post_options (const char ** fn)
if (!global_options_set.x_flag_exceptions)
global.params.useExceptions = false;
- global.params.checkAction = CHECKACTION_halt;
+ global.params.checkAction = CHECKACTION_C;
}
/* Keep in sync with existing -fbounds-check flag. */
diff --git a/gcc/d/d-tree.h b/gcc/d/d-tree.h
index 3338e88b278..dd38b732837 100644
--- a/gcc/d/d-tree.h
+++ b/gcc/d/d-tree.h
@@ -560,6 +560,7 @@ extern tree build_memref (tree, tree, tree);
extern tree build_array_set (tree, tree, tree);
extern tree build_array_from_val (Type *, tree);
extern tree void_okay_p (tree);
+extern tree build_array_bounds_call (const Loc &);
extern tree build_bounds_condition (const Loc &, tree, tree, bool);
extern bool array_bounds_check (void);
extern tree bind_expr (tree, tree);
diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc
index 06cd83a737d..bf9bb45690a 100644
--- a/gcc/d/expr.cc
+++ b/gcc/d/expr.cc
@@ -1218,9 +1218,7 @@ public:
if (!e->indexIsInBounds && array_bounds_check ())
{
- tree tassert = (global.params.checkAction == CHECKACTION_D)
- ? d_assert_call (e->loc, LIBCALL_ARRAY_BOUNDS)
- : build_call_expr (builtin_decl_explicit (BUILT_IN_TRAP), 0);
+ tree tassert = build_array_bounds_call (e->loc);
result = d_save_expr (result);
result = build_condition (TREE_TYPE (result),
--
2.25.1
