aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/canthrow.d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2023-11-12 14:21:43 +0100
committerIain Buclaw <ibuclaw@gdcproject.org>2023-11-21 14:29:28 +0100
commit87b9a01ea79a3af39f3adf7b60aa9526a32de17e (patch)
tree3a06e800632f8bd8ad391f0bffe2419ae8da5e15 /gcc/d/dmd/canthrow.d
parentda332ce109451c8965cb64847934da154d7dcf94 (diff)
downloadgcc-87b9a01ea79a3af39f3adf7b60aa9526a32de17e.zip
gcc-87b9a01ea79a3af39f3adf7b60aa9526a32de17e.tar.gz
gcc-87b9a01ea79a3af39f3adf7b60aa9526a32de17e.tar.bz2
d: Merge upstream dmd 65a3da148c, phobos fc06c514a.
D front-end changes: - Import latest bug fixes from dmd v2.106.0-beta.1. Phobos changes: - Import latest bug fixes from phobos v2.106.0-beta.1. - `std.range.primitives.isForwardRange' now takes an optional element type. gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 65a3da148c. libphobos/ChangeLog: * src/MERGE: Merge upstream phobos fc06c514a.
Diffstat (limited to 'gcc/d/dmd/canthrow.d')
-rw-r--r--gcc/d/dmd/canthrow.d3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/d/dmd/canthrow.d b/gcc/d/dmd/canthrow.d
index 8aece3b..6730592 100644
--- a/gcc/d/dmd/canthrow.d
+++ b/gcc/d/dmd/canthrow.d
@@ -22,6 +22,7 @@ import dmd.declaration;
import dmd.dsymbol;
import dmd.errorsink;
import dmd.expression;
+import dmd.expressionsem;
import dmd.func;
import dmd.globals;
import dmd.init;
@@ -80,7 +81,7 @@ CT canThrow(Expression e, FuncDeclaration func, ErrorSink eSink)
if (!f.isDtorDeclaration())
errorSupplementalInferredAttr(f, 10, false, STC.nothrow_);
- e.checkOverriddenDtor(null, f, dd => dd.type.toTypeFunction().isnothrow, "not nothrow");
+ f.checkOverriddenDtor(null, e.loc, dd => dd.type.toTypeFunction().isnothrow, "not nothrow");
}
else if (func)
{