mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

escape.d: Consolidate notMaybeScope and doNotInferScope

Browse source
This commit is contained in:
Dennis Korpel 2024-07-24 23:18:15 +02:00 • committed by The Dlang Bot
parent 8861582cc5
commit fe8bf49dba
2 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

42
compiler/src/dmd/escape.d
View file

@ -381,7 +381,7 @@ bool checkParamArgumentEscape(ref Scope sc, FuncDeclaration fdc, Identifier parI
if (parStc & STC.scope_ || v.isDataseg()) if (parStc & STC.scope_ || v.isDataseg())
return; return;
notMaybeScope(v, vPar); doNotInferScope(v, vPar);
if (v.isScope()) if (v.isScope())
{ {
@ -397,7 +397,7 @@ bool checkParamArgumentEscape(ref Scope sc, FuncDeclaration fdc, Identifier parI
Dsymbol p = v.toParent2(); Dsymbol p = v.toParent2();
notMaybeScope(v, arg); doNotInferScope(v, arg);
if (checkScopeVarAddr(v, arg, sc, gag)) if (checkScopeVarAddr(v, arg, sc, gag))
{ {
result = true; result = true;
@ -426,7 +426,7 @@ bool checkParamArgumentEscape(ref Scope sc, FuncDeclaration fdc, Identifier parI
Dsymbol p = v.toParent2(); Dsymbol p = v.toParent2();
notMaybeScope(v, arg); doNotInferScope(v, arg);
if ((v.isReference() || v.isScope()) && p == sc.func) if ((v.isReference() || v.isScope()) && p == sc.func)
{ {
@ -716,7 +716,7 @@ bool checkAssignEscape(ref Scope sc, Expression e, bool gag, bool byRef)
} }
if (!(va && va.isScope()) || vaIsRef) if (!(va && va.isScope()) || vaIsRef)
notMaybeScope(v, e); doNotInferScope(v, e);
if (v.isScope()) if (v.isScope())
{ {
@ -781,7 +781,8 @@ bool checkAssignEscape(ref Scope sc, Expression e, bool gag, bool byRef)
* It may escape via that assignment, therefore, v can never be 'scope'. * It may escape via that assignment, therefore, v can never be 'scope'.
*/ */
//printf("no infer for %s in %s, %d\n", v.toChars(), fd.ident.toChars(), __LINE__); //printf("no infer for %s in %s, %d\n", v.toChars(), fd.ident.toChars(), __LINE__);
doNotInferScope(v, e); if (!v.isParameter)
doNotInferScope(v, e);
} }
} }
@ -829,7 +830,7 @@ bool checkAssignEscape(ref Scope sc, Expression e, bool gag, bool byRef)
} }
if (!(va && va.isScope())) if (!(va && va.isScope()))
notMaybeScope(v, e); doNotInferScope(v, e);
if (p != sc.func) if (p != sc.func)
return; return;
@ -866,7 +867,7 @@ bool checkAssignEscape(ref Scope sc, Expression e, bool gag, bool byRef)
Dsymbol p = v.toParent2(); Dsymbol p = v.toParent2();
if (!(va && va.isScope())) if (!(va && va.isScope()))
notMaybeScope(v, e); doNotInferScope(v, e);
if (!(v.isReference() || v.isScope()) || p != fd) if (!(v.isReference() || v.isScope()) || p != fd)
return; return;
@ -950,7 +951,7 @@ bool checkThrowEscape(ref Scope sc, Expression e, bool gag)
} }
else else
{ {
notMaybeScope(v, new ThrowExp(e.loc, e)); doNotInferScope(v, new ThrowExp(e.loc, e));
} }
} }
void onFunc(FuncDeclaration fd, bool called) {} void onFunc(FuncDeclaration fd, bool called) {}
@ -1018,7 +1019,7 @@ bool checkNewEscape(ref Scope sc, Expression e, bool gag)
else else
{ {
//printf("no infer for %s in %s, %d\n", v.toChars(), sc.func.ident.toChars(), __LINE__); //printf("no infer for %s in %s, %d\n", v.toChars(), sc.func.ident.toChars(), __LINE__);
notMaybeScope(v, e); doNotInferScope(v, e);
} }
} }
@ -1242,7 +1243,7 @@ private bool checkReturnEscapeImpl(ref Scope sc, Expression e, bool refs, bool g
} }
} }
} }
else else if (p == sc.func || !v.isParameter())
{ {
//printf("no infer for %s in %s, %d\n", v.toChars(), sc.func.ident.toChars(), __LINE__); //printf("no infer for %s in %s, %d\n", v.toChars(), sc.func.ident.toChars(), __LINE__);
doNotInferScope(v, e); doNotInferScope(v, e);
@ -2028,7 +2029,7 @@ public void findAllOuterAccessedVariables(FuncDeclaration fd, VarDeclarations* v
* - `VarDeclaration` of a non-scope parameter it was assigned to * - `VarDeclaration` of a non-scope parameter it was assigned to
* - `null` for no reason * - `null` for no reason
*/ */
private void notMaybeScope(VarDeclaration v, RootObject o) private void doNotInferScope(VarDeclaration v, RootObject o)
{ {
if (v.maybeScope) if (v.maybeScope)
{ {
@ -2038,23 +2039,6 @@ private void notMaybeScope(VarDeclaration v, RootObject o)
} }
} }
/***********************************
* Turn off `maybeScope` for variable `v` if it's not a parameter.
*
* This is for compatibility with the old system with both `STC.maybescope` and `VarDeclaration.doNotInferScope`,
* which is now just `VarDeclaration.maybeScope`.
* This function should probably be removed in future refactors.
*
* Params:
* v = variable
* o = reason for it being turned off
*/
private void doNotInferScope(VarDeclaration v, RootObject o)
{
if (!v.isParameter)
notMaybeScope(v, o);
}
/*********************************** /***********************************
* After semantic analysis of the function body, * After semantic analysis of the function body,
* try to infer `scope` / `return` on the parameters * try to infer `scope` / `return` on the parameters
@ -2261,7 +2245,7 @@ private bool checkScopeVarAddr(VarDeclaration v, Expression e, ref Scope sc, boo
if (!v.isScope()) if (!v.isScope())
{ {
notMaybeScope(v, e); doNotInferScope(v, e);
return false; return false;
} }

21
compiler/test/compilable/scope.d
View file

@ -354,3 +354,24 @@ struct Scape
{ {
Scape(null); Scape(null);
} }
/************************************/
// Test `scope` inference in presence of nested function returning `this`:
// `save()` can still be called on a `scope Result`
struct Result
{
int* source;
auto save()
{
int* saveI() { return this.source; }
auto saveResult = Result(saveI());
}
}
@safe escapeNested()
{
int s;
auto r = Result(&s);
r.save();
}