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

Extracted Dsymbol.hasPointers to visitor in dsymbolsem (#21140)

Browse source
This commit is contained in:
Matthew Qiu 2025-04-08 04:20:01 -04:00 • committed by GitHub
parent 857d4a64c8
commit 69b2b10aef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 61 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/src/dmd/attrib.d
View file

@ -110,11 +110,6 @@ extern (C++) abstract class AttribDeclaration : Dsymbol
return "attribute";
}
override final bool hasPointers()
{
return this.include(null).foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
/****************************************
*/
override final void addObjcSymbols(ClassDeclarations* classes, ClassDeclarations* categories)

1
compiler/src/dmd/attrib.h
View file

@ -29,7 +29,6 @@ class AttribDeclaration : public Dsymbol
public:
Dsymbols *decl; // array of Dsymbol's
const char *kind() const override;
bool hasPointers() override final;
void accept(Visitor *v) override { v->visit(this); }
};

6
compiler/src/dmd/cxxfrontend.d
View file

@ -198,6 +198,12 @@ bool isAbstract(ClassDeclaration cd)
return dmd.dsymbolsem.isAbstract(cd);
}
bool hasPointers(Dsymbol d)
{
import dmd.dsymbolsem;
return dmd.dsymbolsem.hasPointers(d);
}
/***********************************************************
* dtemplate.d
*/

6
compiler/src/dmd/declaration.d
View file

@ -1035,12 +1035,6 @@ extern (C++) class VarDeclaration : Declaration
vbitoffset < bitoffset + tbitsize;
}
override final bool hasPointers()
{
//printf("VarDeclaration::hasPointers() %s, ty = %d\n", toChars(), type.ty);
return (!isDataseg() && type.hasPointers());
}
/*************************************
* Return true if we can take the address of this variable.
*/

1
compiler/src/dmd/declaration.h
View file

@ -298,7 +298,6 @@ public:
bool isThreadlocal() override final;
bool isCTFE();
bool isOverlappedWith(VarDeclaration *v);
bool hasPointers() override final;
bool canTakeAddressOf();
bool needsScopeDtor();
Dsymbol *toAlias() override final;

3
compiler/src/dmd/dstruct.d
View file

@ -158,13 +158,14 @@ extern (C++) class StructDeclaration : AggregateDeclaration
return;
foreach (vd; fields)
{
import dmd.dsymbolsem : hasPointers;
if (vd.storage_class & STC.ref_ || vd.hasPointers())
{
hasPointerField = true;
hasUnsafeBitpatterns = true;
}
if (vd._init && vd._init.isVoidInitializer() && vd.type.hasPointers())
if (vd._init && vd._init.isVoidInitializer() && vd.hasPointers())
hasVoidInitPointers = true;
if (vd.storage_class & STC.system || vd.type.hasUnsafeBitpatterns())

9
compiler/src/dmd/dsymbol.d
View file

@ -963,15 +963,6 @@ extern (C++) class Dsymbol : ASTNode
return true;
}
/*****************************************
* Is Dsymbol a variable that contains pointers?
*/
bool hasPointers()
{
//printf("Dsymbol::hasPointers() %s\n", toChars());
return false;
}
void addObjcSymbols(ClassDeclarations* classes, ClassDeclarations* categories)
{
}

2
compiler/src/dmd/dsymbol.h
View file

@ -243,7 +243,6 @@ public:
virtual bool needThis(); // need a 'this' pointer?
virtual Visibility visible();
virtual Dsymbol *syntaxCopy(Dsymbol *s); // copy only syntax trees
virtual bool hasPointers();
virtual void addObjcSymbols(ClassDeclarations *, ClassDeclarations *) { }
virtual void addComment(const utf8_t *comment);
@ -428,4 +427,5 @@ namespace dmd
Dsymbols *include(Dsymbol *d, Scope *sc);
void setScope(Dsymbol *d, Scope *sc);
void importAll(Dsymbol *d, Scope *sc);
bool hasPointers(Dsymbol *d);
}

49
compiler/src/dmd/dsymbolsem.d
View file

@ -953,6 +953,8 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
if (dsym.storage_class & STC.constscoperef)
dsym.storage_class |= STC.scope_;
import dmd.typesem : hasPointers;
if (dsym.storage_class & STC.scope_)
{
STC stc = dsym.storage_class & (STC.static_ | STC.extern_ | STC.manifest | STC.gshared);
@ -8641,3 +8643,50 @@ private extern(C++) class FinalizeSizeVisitor : Visitor
sd.argTypes = target.toArgTypes(sd.type);
}
}
/*****************************************
* Is Dsymbol a variable that contains pointers?
*/
bool hasPointers(Dsymbol d)
{
scope v = new HasPointersVisitor();
d.accept(v);
return v.result;
}
private extern(C++) class HasPointersVisitor : Visitor
{
import dmd.mtype : Type;
alias visit = Visitor.visit;
bool result;
override void visit(AttribDeclaration ad)
{
result = ad.include(null).foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
override void visit(VarDeclaration vd)
{
import dmd.typesem : hasPointers;
result = (!vd.isDataseg() && vd.type.hasPointers());
}
override void visit(Dsymbol d)
{
//printf("Dsymbol::hasPointers() %s\n", toChars());
result = false;
}
override void visit(TemplateMixin tm)
{
//printf("TemplateMixin.hasPointers() %s\n", toChars());
result = tm.members.foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
override void visit(Nspace ns)
{
//printf("Nspace::hasPointers() %s\n", toChars());
result = ns.members.foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
}

6
compiler/src/dmd/dtemplate.d
View file

@ -5490,12 +5490,6 @@ extern (C++) final class TemplateMixin : TemplateInstance
return "mixin";
}
override bool hasPointers()
{
//printf("TemplateMixin.hasPointers() %s\n", toChars());
return members.foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
extern (D) bool findTempDecl(Scope* sc)
{
// Follow qualifications to find the TemplateDeclaration

5
compiler/src/dmd/frontend.h
View file

@ -618,7 +618,6 @@ public:
virtual bool needThis();
virtual Visibility visible();
virtual Dsymbol* syntaxCopy(Dsymbol* s);
virtual bool hasPointers();
virtual void addObjcSymbols(Array<ClassDeclaration* >* classes, Array<ClassDeclaration* >* categories);
virtual void addComment(const char* comment);
const char* comment();
@ -1822,7 +1821,6 @@ public:
TypeQualified* tqual;
TemplateInstance* syntaxCopy(Dsymbol* s) override;
const char* kind() const override;
bool hasPointers() override;
void accept(Visitor* v) override;
};
@ -4916,7 +4914,6 @@ class Nspace final : public ScopeDsymbol
public:
Expression* identExp;
Nspace* syntaxCopy(Dsymbol* s) override;
bool hasPointers() override;
const char* kind() const override;
void accept(Visitor* v) override;
};
@ -6418,7 +6415,6 @@ class AttribDeclaration : public Dsymbol
public:
Array<Dsymbol* >* decl;
const char* kind() const override;
bool hasPointers() final override;
void addObjcSymbols(Array<ClassDeclaration* >* classes, Array<ClassDeclaration* >* categories) final override;
void accept(Visitor* v) override;
};
@ -6892,7 +6888,6 @@ public:
bool isThreadlocal() final override;
bool isCTFE();
bool isOverlappedWith(VarDeclaration* v);
bool hasPointers() final override;
bool canTakeAddressOf();
bool needsScopeDtor();
Dsymbol* toAlias() final override;

6
compiler/src/dmd/nspace.d
View file

@ -78,12 +78,6 @@ extern (C++) final class Nspace : ScopeDsymbol
return ns;
}
override bool hasPointers()
{
//printf("Nspace::hasPointers() %s\n", toChars());
return members.foreachDsymbol( (s) { return s.hasPointers(); } ) != 0;
}
override const(char)* kind() const
{
return "namespace";

1
compiler/src/dmd/nspace.h
View file

@ -21,7 +21,6 @@ class Nspace final : public ScopeDsymbol
public:
Expression *identExp;
Nspace *syntaxCopy(Dsymbol *s) override;
bool hasPointers() override;
const char *kind() const override;
void accept(Visitor *v) override { v->visit(this); }
};

1
compiler/src/dmd/template.h
View file

@ -284,7 +284,6 @@ public:
TemplateMixin *syntaxCopy(Dsymbol *s) override;
const char *kind() const override;
bool hasPointers() override;
void accept(Visitor *v) override { v->visit(this); }
};

2
compiler/src/dmd/toobj.d
View file

@ -35,7 +35,7 @@ import dmd.dmodule;
import dmd.dscope;
import dmd.dstruct;
import dmd.dsymbol;
import dmd.dsymbolsem : hasStaticCtorOrDtor, include, isFuncHidden, isAbstract;
import dmd.dsymbolsem : hasPointers, hasStaticCtorOrDtor, include, isFuncHidden, isAbstract;
import dmd.dtemplate;
import dmd.errors;
import dmd.errorsink;

2
compiler/src/dmd/typesem.d
View file

@ -6686,6 +6686,7 @@ STC parameterStorageClass(TypeFunction tf, Type tthis, Parameter p, VarDeclarati
// Check escaping through `this`
if (tthis && tthis.isMutable())
{
import dmd.dsymbolsem : hasPointers;
foreach (VarDeclaration v; isAggregate(tthis).fields)
{
if (v.hasPointers())
@ -6696,6 +6697,7 @@ STC parameterStorageClass(TypeFunction tf, Type tthis, Parameter p, VarDeclarati
// Check escaping through nested context
if (outerVars && tf.isMutable())
{
import dmd.dsymbolsem : hasPointers;
foreach (VarDeclaration v; *outerVars)
{
if (v.hasPointers())