diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-08-25 11:44:48 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-08-26 10:03:55 +0200 |
| commit | 0f5c98b6a1a7eed281e359f40bc2e4326f2a2f56 (patch) | |
| tree | ca23bf0a387a66f74738551ff1d31cb323d7e8c9 /gcc/d/dmd/expressionsem.c | |
| parent | 7421802276e737c2da297599121480833db92de9 (diff) | |
| download | gcc-0f5c98b6a1a7eed281e359f40bc2e4326f2a2f56.zip gcc-0f5c98b6a1a7eed281e359f40bc2e4326f2a2f56.tar.gz gcc-0f5c98b6a1a7eed281e359f40bc2e4326f2a2f56.tar.bz2 | |
d: Merge upstream dmd cb4a96fae
Fixes both a bug where compilation would hang, and an issue where recursive
template limits are hit too early.
Reviewed-on: https://github.com/dlang/dmd/pull/11621
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd cb4a96fae
Diffstat (limited to 'gcc/d/dmd/expressionsem.c')
| -rw-r--r-- | gcc/d/dmd/expressionsem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/d/dmd/expressionsem.c b/gcc/d/dmd/expressionsem.c index 9f21dab..d251996 100644 --- a/gcc/d/dmd/expressionsem.c +++ b/gcc/d/dmd/expressionsem.c @@ -2896,7 +2896,7 @@ public: else { static int nest; - if (++nest > 500) + if (++nest > global.recursionLimit) { exp->error("recursive evaluation of %s", exp->toChars()); --nest; |