From f14d97d78660c95132dae6615aab46f4cc3d1b57 Mon Sep 17 00:00:00 2001
From: Christian Kamm <kamm@incasoftware.de>
Date: Sun, 30 Nov 2008 11:25:40 +0100
Subject: [PATCH] Move storage of final vtbl from BaseClass to IrInterface:
 BaseClass instances are shared! Always use the target's irstruct interfaceMap
 when building the const initializer. Tango helloworld works again.

---
 dmd/aggregate.h | 2 ++
 gen/classes.cpp | 8 ++++----
 ir/irstruct.h   | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dmd/aggregate.h b/dmd/aggregate.h
index a268a6bf..cdb326ee 100644
--- a/dmd/aggregate.h
+++ b/dmd/aggregate.h
@@ -154,6 +154,8 @@ struct UnionDeclaration : StructDeclaration
     UnionDeclaration *isUnionDeclaration() { return this; }
 };
 
+// warning: two classes with the same base class share the same
+//   BaseClass instance.
 struct BaseClass
 {
     Type *type;				// (before semantic processing)
diff --git a/gen/classes.cpp b/gen/classes.cpp
index deea99ac..dba377ae 100644
--- a/gen/classes.cpp
+++ b/gen/classes.cpp
@@ -66,7 +66,7 @@ static void add_interface(ClassDeclaration* target, BaseClass* b, int newinstanc
     }
 
     // build the interface vtable
-    b->fillVtbl(target, &b->vtbl, newinstance);
+    b->fillVtbl(target, &iri->vtblDecls, newinstance);
 
     // add the vtable type
     assert(inter->type->ir.type);
@@ -493,8 +493,8 @@ static size_t init_class_initializer(std::vector<LLConstant*>& inits, ClassDecla
         lastsize = var->type->size();
     }
 
-    // if it's a class, and it implements interfaces, add the vtables
-    IrStruct* irstruct = cd->ir.irStruct;
+    // if it's a class, and it implements interfaces, add the vtables - as found in the target class!
+    IrStruct* irstruct = target->ir.irStruct;
 
     size_t nvtbls = cd->vtblInterfaces->dim;
     for(size_t i=0; i<nvtbls; i++)
@@ -592,7 +592,7 @@ static void init_class_interface_vtbl_initializers(ClassDeclaration* cd)
         Logger::println("interface %s", iri->decl->toChars());
 
         // build vtable intializer for this interface implementation
-        Array& arr = iri->base->vtbl;
+        Array& arr = iri->vtblDecls;
         size_t narr = arr.dim;
 
         if (narr > 0)
diff --git a/ir/irstruct.h b/ir/irstruct.h
index c4d51bd3..eca25a25 100644
--- a/ir/irstruct.h
+++ b/ir/irstruct.h
@@ -164,6 +164,7 @@ struct IrInterface : IrBase
 
     LLConstant* vtblInit;
     LLGlobalVariable* vtbl;
+    Array vtblDecls; // array of FuncDecls that make up the vtbl
 
     const LLStructType* infoTy;
     LLConstant* infoInit;