Merge DMD r294: bugzilla 2816 Sudden-death static assert is not... bugzilla 2816 Sudden-death static assert is not very useful. --- dmd/expression.h | 12 ++++++ dmd/staticassert.c | 10 +--- dmd/template.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- dmd/template.h | 2 + 4 files changed, 117 insertions(+), 15 deletions(-)

module scope5;

int i;

void func(int a, int b)
{
    i = 0;
    {
        scope(exit) i++;
        if (a) {
            scope(exit) i++;
            if (b) return;
            i++;
        }
    }
    i++;
}

void main()
{
    func(0,0);
    assert(i == 2);
    func(1,1);
    assert(i == 2);
    func(1,0);
    assert(i == 4);
}