Skip to content

Commit

Permalink
fix 9148 - Issue 9148 - 'pure' is broken
Browse files Browse the repository at this point in the history
  • Loading branch information
@9rnsr
9rnsr committed Sep 30, 2014
1 parent 4c39671 commit ec19b35
Show file tree
Hide file tree
Showing 11 changed files with 286 additions and 68 deletions.
3 changes: 2 additions & 1 deletion src/declaration.c
View file
Expand Up @@ -1869,7 +1869,7 @@ void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
if (FuncLiteralDeclaration *fld = s->isFuncLiteralDeclaration())
{
fld->tok = TOKdelegate;

#if 0
/* This is necessary to avoid breaking tests for 8751 & 8793.
* See: compilable/testInference.d
*/
Expand All @@ -1882,6 +1882,7 @@ void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
{
fld->setImpure(); // Bugzilla 9415
}
#endif
}
}

Expand Down
37 changes: 29 additions & 8 deletions src/expression.c
View file
Expand Up @@ -2234,8 +2234,8 @@ void Expression::checkPurity(Scope *sc, FuncDeclaration *f)
/* Given:
* void f() {
* pure void g() {
* void h() {
* void i() { }
* /+pure+/ void h() {
* /+pure+/ void i() { }
* }
* }
* }
Expand Down Expand Up @@ -2347,9 +2347,9 @@ void Expression::checkPurity(Scope *sc, VarDeclaration *v)
* int fx;
* pure void g() {
* int gx;
* void h() {
* /+pure+/ void h() {
* int hx;
* void i() { }
* /+pure+/ void i() { }
* }
* }
* }
Expand All @@ -2362,15 +2362,36 @@ void Expression::checkPurity(Scope *sc, VarDeclaration *v)
if (s == vparent)
break;

if (AggregateDeclaration *ad = s->isAggregateDeclaration())
{
if (ad->isNested())
continue;
break;
}
FuncDeclaration *ff = s->isFuncDeclaration();
if (!ff)
break;
if (sc->flags & SCOPEcompile ? ff->isPureBypassingInferenceX() : ff->setImpure())
if (ff->isNested())
{
error("pure nested function '%s' cannot access mutable data '%s'",
ff->toChars(), v->toChars());
break;
if (ff->type->isImmutable())
{
error("pure immutable nested function '%s' cannot access mutable data '%s'",
ff->toPrettyChars(), v->toChars());
break;
}
continue;
}
if (ff->isThis())
{
if (ff->type->isImmutable())
{
error("pure immutable member function '%s' cannot access mutable data '%s'",
ff->toPrettyChars(), v->toChars());
break;
}
continue;
}
break;
}
}

Expand Down
24 changes: 24 additions & 0 deletions src/func.c
View file
Expand Up @@ -450,6 +450,30 @@ void FuncDeclaration::semantic(Scope *sc)
if (fd->isSafeBypassingInference() && !isInstantiated())
tf->trust = TRUSTsafe; // default to @safe
}

/* If the nesting parent is pure, then this function defaults to pure too.
*/
if (tf->purity == PUREimpure && (isNested() || isThis()))
{
FuncDeclaration *fd = NULL;
for (Dsymbol *p = toParent2(); p; p = p->toParent2())
{
if (AggregateDeclaration *ad = p->isAggregateDeclaration())
{
if (ad->isNested())
continue;
break;
}
if ((fd = p->isFuncDeclaration()) != NULL)
break;
}

/* If the parent's purity is inferred, then this function's purity needs
* to be inferred first.
*/
if (fd && fd->isPureBypassingInferenceX())
tf->purity = PUREfwdref; // default to pure
}
}

if (tf->isref) sc->stc |= STCref;
Expand Down
177 changes: 170 additions & 7 deletions test/compilable/testInference.d
View file
Expand Up @@ -118,7 +118,7 @@ void f6359() pure nothrow @safe @nogc
static assert(!__traits(compiles, gcable6359()));
static assert(!__traits(compiles, global6359++));

//static assert(!__traits(compiles, { impure6359(); }())); // BUG: blocked by issue 9148.
static assert(!__traits(compiles, { impure6359(); }()));
static assert(!__traits(compiles, { throwable6359(); }()));
static assert(!__traits(compiles, { system6359(); }()));
static assert(!__traits(compiles, { gcable6359(); }()));
Expand All @@ -133,7 +133,7 @@ void g6359()() pure nothrow @safe @nogc
static assert(!__traits(compiles, gcable6359()));
static assert(!__traits(compiles, global6359++));

//static assert(!__traits(compiles, { impure6359(); }())); // BUG: blocked by issue 9148.
static assert(!__traits(compiles, { impure6359(); }()));
static assert(!__traits(compiles, { throwable6359(); }()));
static assert(!__traits(compiles, { system6359(); }()));
static assert(!__traits(compiles, { gcable6359(); }()));
Expand All @@ -153,7 +153,7 @@ void h6359()()
static assert( __traits(compiles, { throwable6359(); }()));
static assert( __traits(compiles, { system6359(); }()));
static assert( __traits(compiles, { gcable6359(); }()));
//static assert( __traits(compiles, { global6359++; }())); // BUG: blocked by issue 9148.
static assert( __traits(compiles, { global6359++; }()));
}

void test6359() pure nothrow @safe @nogc
Expand Down Expand Up @@ -291,14 +291,19 @@ Dg8793 foo8793fp1(immutable Fp8793 f) pure { return x => (*f)(x); } // OK
Dg8793 foo8793fp2( const Fp8793 f) pure { return x => (*f)(x); } // OK

Dg8793 foo8793dg1(immutable Dg8793 f) pure { return x => f(x); } // OK
Dg8793 foo8793dg2( const Dg8793 f) pure { return x => f(x); } // error -> OK
Dg8793 foo8793dg2( const Dg8793 f) pure { return x => f(x); } // OK <- error

Dg8793 foo8793pfp1(immutable Fp8793* f) pure { return x => (*f)(x); } // OK
Dg8793 foo8793pdg1(immutable Dg8793* f) pure { return x => (*f)(x); } // OK

Dg8793 foo8793pfp2(const Fp8793* f) pure { return x => (*f)(x); } // OK <- error
Dg8793 foo8793pdg2(const Dg8793* f) pure { return x => (*f)(x); } // OK <- error

// general case for the hasPointer type
Dg8793 foo8793ptr1(immutable int* p) pure { return x => *p == x; } // OK

Dg8793 foo8793ptr2(const int* p) pure { return x => *p == x; } // OK <- error

/***************************************************/
// 9072

Expand Down Expand Up @@ -331,6 +336,164 @@ void test5933()
static assert(typeof(S5933.init.foo!()).stringof == "pure nothrow @nogc @safe double(double a)");
}

/***************************************************/
// 9148

void test9148a() pure
{
static int g;
int x;

void foo1() /+pure+/
{
static assert(!__traits(compiles, g++));
x++;
}
void foo2() pure
{
static assert(!__traits(compiles, g++));
x++;
}
foo1();
static assert(is(typeof(&foo1) == void delegate() pure));
foo2();
static assert(is(typeof(&foo2) == void delegate() pure));

void bar1() immutable /+pure+/
{
static assert(!__traits(compiles, g++));
static assert(!__traits(compiles, x++));
}
void bar2() immutable pure
{
static assert(!__traits(compiles, g++));
static assert(!__traits(compiles, x++));
}
bar1();
static assert(is(typeof(&bar1) == void delegate() pure immutable));
bar2();
static assert(is(typeof(&bar2) == void delegate() pure immutable));

struct S
{
void foo1() /+pure+/
{
static assert(!__traits(compiles, g++));
x++;
}
void foo2() pure
{
static assert(!__traits(compiles, g++));
x++;
}
void bar1() immutable /+pure+/
{
static assert(!__traits(compiles, g++));
static assert(!__traits(compiles, x++));
}
void bar2() immutable pure
{
static assert(!__traits(compiles, g++));
static assert(!__traits(compiles, x++));
}
}

S sm;
sm.foo1();
static assert(is(typeof(&sm.foo1) == void delegate() pure));
sm.foo2();
static assert(is(typeof(&sm.foo2) == void delegate() pure));

immutable S si;
si.bar1();
static assert(is(typeof(&si.bar1) == void delegate() pure immutable));
si.bar2();
static assert(is(typeof(&si.bar2) == void delegate() pure immutable));
}

// ----
// inheritance of pure and @safe

void test9148b() pure nothrow @nogc @safe
{
void nf() {}
static assert(is(typeof(&nf) == void delegate() @safe pure));

struct NS
{
void mf() {}
static void sf() {}
}
NS ns;
static assert(is(typeof(&ns.mf) == void delegate() @safe pure));
static assert(is(typeof(&NS.sf) == void function() @safe));

static void sf() {}
static assert(is(typeof(&sf) == void function() @safe));

static struct SS
{
void mf() {}
static void sf() {}
}
SS ss;
static assert(is(typeof(&ss.mf) == void delegate() @safe));
static assert(is(typeof(&SS.sf) == void function() @safe));
}

void impureSystem9148b() {}
void func9148b()()
{
void bar() // do not inherit PUREfwdref
{
static assert(is(typeof(&bar) == void delegate()));
impureSystem9148b();
}
static assert(is(typeof(&bar) == void delegate()));
}
static assert(is(typeof(&func9148b!()) == void function() pure nothrow @nogc @safe));

// ----
// from fail_compilation/fail283.d

pure int double_sqr9148c(int x)
{
int y = x;
void do_sqr() pure { y *= y; }
do_sqr();
return y;
}

void test9148c()
{
assert(double_sqr9148c(10) == 100);
}

// ----
// from fail_compilation/fail348.d

void test9148d() pure
{
void g() // implicitly marked as 'pure'
{
void h() pure
{
// i() and j() are implicitly marked as 'pure'
void i() { }
void j() { i(); g(); } // can call i() and g()
}
}
}

void test9148e()
{
int x;
static assert(is(typeof((int a){ return a + x; }) == int delegate(int) pure nothrow @nogc @safe));

auto dg = (int a){ return a + x; };
static assert(is(typeof(dg) == int delegate(int) pure nothrow @nogc @safe));
}

/***************************************************/
// 10002

Expand Down Expand Up @@ -363,7 +526,7 @@ class Node10002
/***************************************************/
// 10148

void fa10148() {} // fa is @system
void fa10148() pure {} // fa is @system

auto fb10148(T)()
{
Expand All @@ -376,7 +539,7 @@ auto fb10148(T)()
void fc(T2)()
{
// [5] During semantic3 process, fc is not @safe on default.
static assert(is(typeof(&fc) == void delegate()));
static assert(is(typeof(&fc) == void delegate() pure));
fa10148();
}
// [1] this is now inferred to @safe by implementing issue 7511
Expand All @@ -393,7 +556,7 @@ void test10148()
// [3] instantiate fc

// [6] Afer semantic3 done, fc!int is deduced to @system.
static assert(is(typeof(&fb10148!int.fc!int) == void delegate() @system));
static assert(is(typeof(&fb10148!int.fc!int) == void delegate() pure @system));
}

/***************************************************/
Expand Down

0 comments on commit ec19b35

Please sign in to comment.