Break mtype.d dependency on dmangle.d (#16016)

dlang · Jan 11, 2024 · e64aaee · e64aaee
1 parent f5dd1a8
commit e64aaee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/compiler/src/dmd/declaration.d b/compiler/src/dmd/declaration.d
@@ -1749,6 +1749,35 @@ extern (C++) final class SymbolDeclaration : Declaration
 
 /***********************************************************
  */
+private Identifier getTypeInfoIdent(Type t)
+{
+ import dmd.dmangle;
+ import core.stdc.stdlib;
+ import dmd.root.rmem;
+ // _init_10TypeInfo_%s
+ OutBuffer buf;
+ buf.reserve(32);
+ mangleToBuffer(t, buf);
+
+ const slice = buf[];
+
+ // Allocate buffer on stack, fail over to using malloc()
+ char[128] namebuf;
+ const namelen = 19 + size_t.sizeof * 3 + slice.length + 1;
+ auto name = namelen <= namebuf.length ? namebuf.ptr : cast(char*)Mem.check(malloc(namelen));
+
+ const length = snprintf(name, namelen, "_D%lluTypeInfo_%.*s6__initZ",
+ cast(ulong)(9 + slice.length), cast(int)slice.length, slice.ptr);
+ //printf("%p %s, deco = %s, name = %s\n", this, toChars(), deco, name);
+ assert(0 < length && length < namelen); // don't overflow the buffer
+
+ auto id = Identifier.idPool(name[0 .. length]);
+
+ if (name != namebuf.ptr)
+ free(name);
+ return id;
+}
+
 extern (C++) class TypeInfoDeclaration : VarDeclaration
 {
  Type tinfo;

diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
@@ -1872,7 +1872,6 @@ class Type : public ASTNode
  virtual structalign_t alignment();
  virtual Expression* defaultInitLiteral(const Loc& loc);
  virtual bool isZeroInit(const Loc& loc);
- Identifier* getTypeInfoIdent();
  virtual int32_t hasWild() const;
  virtual bool hasVoidInitPointers();
  virtual bool hasSystemFields();

diff --git a/compiler/src/dmd/mtype.d b/compiler/src/dmd/mtype.d
@@ -26,7 +26,6 @@ import dmd.dclass;
 import dmd.dcast;
 import dmd.declaration;
 import dmd.denum;
-import dmd.dmangle;
 import dmd.dscope;
 import dmd.dstruct;
 import dmd.dsymbol;
@@ -2150,32 +2149,6 @@ extern (C++) abstract class Type : ASTNode
  return false; // assume not
  }
 
- final Identifier getTypeInfoIdent()
- {
- // _init_10TypeInfo_%s
- OutBuffer buf;
- buf.reserve(32);
- mangleToBuffer(this, buf);
-
- const slice = buf[];
-
- // Allocate buffer on stack, fail over to using malloc()
- char[128] namebuf;
- const namelen = 19 + size_t.sizeof * 3 + slice.length + 1;
- auto name = namelen <= namebuf.length ? namebuf.ptr : cast(char*)Mem.check(malloc(namelen));
-
- const length = snprintf(name, namelen, "_D%lluTypeInfo_%.*s6__initZ",
- cast(ulong)(9 + slice.length), cast(int)slice.length, slice.ptr);
- //printf("%p %s, deco = %s, name = %s\n", this, toChars(), deco, name);
- assert(0 < length && length < namelen); // don't overflow the buffer
-
- auto id = Identifier.idPool(name[0 .. length]);
-
- if (name != namebuf.ptr)
- free(name);
- return id;
- }
-
  /***************************************
  * Return !=0 if the type or any of its subtypes is wild.
  */

diff --git a/compiler/src/dmd/mtype.h b/compiler/src/dmd/mtype.h
@@ -301,7 +301,6 @@ class Type : public ASTNode
  virtual structalign_t alignment();
  virtual Expression *defaultInitLiteral(const Loc &loc);
  virtual bool isZeroInit(const Loc &loc = Loc()); // if initializer is 0
- Identifier *getTypeInfoIdent();
  virtual int hasWild() const;
  virtual bool hasVoidInitPointers();
  virtual bool hasSystemFields();