Changeset 1401:e2cf1f67ca33

Timestamp:

05/20/09 10:20:59 (3 years ago)

Author:

Frits van Bommel <fvbommel wxs.nl>

branch:

default

Message:

Don't print the entire declaration of the alliassee when ->toChars() is
called on an AliasDeclaration; just printing the name will do. This fixes
#305, which otherwise tries to generate

  class E {
      void A() {
          alias /* recurse into E->toCBuffer() */ m;
      }
  }

by way of an infinite recursion (causing a segfault when the stack runs out).

Files:

• dmd/declaration.c (modified) (2 diffs)
• gen/toir.cpp (modified) (1 diff)
• tests/mini/compile_bug305.d (added)

dmd/declaration.c

@@ -576 +576 @@
-    if (haliassym)
-    {
-haliassym->toCBuffer(buf, hgs
+buf->writestring(haliassym->toChars()
-        buf->writeByte(' ');
-        buf->writestring(ident->toChars());
@@ -588 +588 @@
-    if (aliassym)
-    {
-aliassym->toCBuffer(buf, hgs
+buf->writestring(aliassym->toChars()
-        buf->writeByte(' ');
-        buf->writestring(ident->toChars());

gen/toir.cpp

@@ -1775 +1775 @@
-        !((TypeClass*)condty)->sym->isInterfaceDeclaration())
-    {
-
+ln
-        llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_invariant");
-        LLValue* arg = DtoBitCast(cond->getRVal(), fn->getFunctionType()->getParamType(0));