From e42589bd629d1c4b38aee2c8fcb924c37c6889b7 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Wed, 16 Jan 2019 20:40:21 +0000 Subject: [PATCH] [D] Fix failing EH execution test on i386. Turn off partitioning unless it was explicitly requested, as it doesn't work with D exception chaining, where personality routines use LSDA to determine whether two thrown exceptions are in the same context. The following distills what was failing in the D testsuite. ``` try { try { fn(); // throws "1" } finally { throw new Exception("2"); } } catch (Exception e) { assert(e.msg == "1"); assert(e.next.msg == "2"); } ``` gcc/d/ChangeLog: PR d/87824 * d-lang.cc (d_post_options): Disable implicit -forder-blocks-and-partition. From-SVN: r267985 --- gcc/d/ChangeLog | 6 ++++++ gcc/d/d-lang.cc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog index 441fed8ddb1..fa4ba35bf6b 100644 --- a/gcc/d/ChangeLog +++ b/gcc/d/ChangeLog @@ -1,3 +1,9 @@ +2019-01-16 Iain Buclaw + + PR d/87824 + * d-lang.cc (d_post_options): Disable implicit + -forder-blocks-and-partition. + 2019-01-16 Iain Buclaw * d-codegen.cc (build_typeof_null_value): New function. diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index 109bf4bf139..b53e56e65a2 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -725,6 +725,12 @@ d_post_options (const char ** fn) global.params.useSwitchError = false; } + /* Turn off partitioning unless it was explicitly requested, as it doesn't + work with D exception chaining, where EH handler uses LSDA to determine + whether two thrown exception are in the same context. */ + if (!global_options_set.x_flag_reorder_blocks_and_partition) + global_options.x_flag_reorder_blocks_and_partition = 0; + /* Error about use of deprecated features. */ if (global.params.useDeprecated == DIAGNOSTICinform && global.params.warnings == DIAGNOSTICerror) -- 2.30.2