From 89bf7d82d7a544531b85530285c179f6cac236cb Mon Sep 17 00:00:00 2001
From: Christian Kamm <kamm@incasoftware.de>
Date: Sun, 15 Feb 2009 11:46:28 +0100
Subject: [PATCH] Change the numbering of static ctors/dtors to be module based
 instead of being global.

This fixes #210 by making sure that the static ctor always gets the same
number, regardless of the order of the modules given at the command line.
---
 dmd/func.c   | 10 ++++++++--
 dmd/module.c |  6 ++++++
 dmd/module.h |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dmd/func.c b/dmd/func.c
index aaae4424..89d99d35 100644
--- a/dmd/func.c
+++ b/dmd/func.c
@@ -2420,7 +2420,7 @@ void DtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 
 StaticCtorDeclaration::StaticCtorDeclaration(Loc loc, Loc endloc)
     : FuncDeclaration(loc, endloc,
-      Identifier::generateId("_staticCtor"), STCstatic, NULL)
+      Lexer::idPool("_staticCtor"), STCstatic, NULL)
 {
 }
 
@@ -2438,6 +2438,9 @@ void StaticCtorDeclaration::semantic(Scope *sc)
 {
     //printf("StaticCtorDeclaration::semantic()\n");
 
+    // get ourselves a scope-unique id
+    ident = sc->module->generateId(ident);
+
     type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
 
     /* If the static ctor appears within a template instantiation,
@@ -2521,7 +2524,7 @@ void StaticCtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 
 StaticDtorDeclaration::StaticDtorDeclaration(Loc loc, Loc endloc)
     : FuncDeclaration(loc, endloc,
-      Identifier::generateId("_staticDtor"), STCstatic, NULL)
+      Lexer::idPool("_staticDtor"), STCstatic, NULL)
 {
     vgate = NULL;
 }
@@ -2538,6 +2541,9 @@ Dsymbol *StaticDtorDeclaration::syntaxCopy(Dsymbol *s)
 
 void StaticDtorDeclaration::semantic(Scope *sc)
 {
+    // get ourselves a scope-unique id
+    ident = sc->module->generateId(ident);
+
     ClassDeclaration *cd;
     Type *tret;
 
diff --git a/dmd/module.c b/dmd/module.c
index 0ba1c4cb..bd8d563f 100644
--- a/dmd/module.c
+++ b/dmd/module.c
@@ -130,6 +130,7 @@ Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen
     llvmForceLogging = false;
     this->doDocComment = doDocComment;
     this->doHdrGen = doHdrGen;
+    uniqueId = 0;
 }
 
 File* Module::buildFilePath(char* forcename, char* path, char* ext)
@@ -1007,3 +1008,8 @@ DsymbolTable *Package::resolve(Array *packages, Dsymbol **pparent, Package **ppk
     }
     return dst;
 }
+
+Identifier* Module::generateId(Identifier* id)
+{
+    return Identifier::generateId(id->string, uniqueId++);
+}
diff --git a/dmd/module.h b/dmd/module.h
index ac8f103a..2964be36 100644
--- a/dmd/module.h
+++ b/dmd/module.h
@@ -179,6 +179,10 @@ struct Module : Package
 
     // array ops emitted in this module already
     StringTable arrayfuncs;
+
+    // for numbering staticCtors etc.
+    int uniqueId;
+    Identifier* generateId(Identifier* id);
 };