From 1c609085a8b94b97658d8ca3e07b6ca2e9c3d383 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 24 Mar 2022 10:26:11 +0100 Subject: [PATCH] Use isReference instead of isRef (#13876) --- src/dmd/escape.d | 2 +- src/dmd/expression.d | 2 +- src/dmd/func.d | 2 +- src/dmd/ob.d | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dmd/escape.d b/src/dmd/escape.d index 4c9ae47db595..32622190352e 100644 --- a/src/dmd/escape.d +++ b/src/dmd/escape.d @@ -793,7 +793,7 @@ bool checkAssignEscape(Scope* sc, Expression e, bool gag) // If va's lifetime encloses v's, then error if (va && - (va.enclosesLifetimeOf(v) || (va.isRef() && !(va.storage_class & STC.temp)) || va.isDataseg()) && + (va.enclosesLifetimeOf(v) || (va.isReference() && !(va.storage_class & STC.temp)) || va.isDataseg()) && fd.setUnsafe()) { if (!gag) diff --git a/src/dmd/expression.d b/src/dmd/expression.d index c379fdfd3d33..0ee37593490d 100644 --- a/src/dmd/expression.d +++ b/src/dmd/expression.d @@ -1288,7 +1288,7 @@ extern (C++) abstract class Expression : ASTNode return false; // magic variable never violates pure and safe if (v.isImmutable()) return false; // always safe and pure to access immutables... - if (v.isConst() && !v.isRef() && (v.isDataseg() || v.isParameter()) && v.type.implicitConvTo(v.type.immutableOf())) + if (v.isConst() && !v.isReference() && (v.isDataseg() || v.isParameter()) && v.type.implicitConvTo(v.type.immutableOf())) return false; // or const global/parameter values which have no mutable indirections if (v.storage_class & STC.manifest) return false; // ...or manifest constants diff --git a/src/dmd/func.d b/src/dmd/func.d index d41596544241..a9f90888b923 100644 --- a/src/dmd/func.d +++ b/src/dmd/func.d @@ -2779,7 +2779,7 @@ extern (C++) class FuncDeclaration : Declaration if (auto ve = rs.exp.isVarExp()) { auto v = ve.var.isVarDeclaration(); - if (!v || v.isOut() || v.isRef()) + if (!v || v.isReference()) return false; else if (nrvo_var is null) { diff --git a/src/dmd/ob.d b/src/dmd/ob.d index c2594fe0138a..7c5505981cbf 100644 --- a/src/dmd/ob.d +++ b/src/dmd/ob.d @@ -1747,7 +1747,7 @@ PtrState toPtrState(VarDeclaration v) */ auto t = v.type; - if (v.isRef()) + if (v.isReference()) { return t.hasMutableFields() ? PtrState.Borrowed : PtrState.Readonly; } @@ -1775,7 +1775,7 @@ bool hasPointersToMutableFields(Type t) { foreach (v; ts.sym.fields) { - if (v.isRef()) + if (v.isReference()) { if (v.type.hasMutableFields()) return true;