Changeset 816:7d16ce7ad19d

Timestamp:

12/01/08 12:34:02 (1 month ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Made ClassInfo?.interfaces generation consistent with DMD, fixes #134
Removed unneeded includes from dmd/attrib.c

Files:

• dmd/attrib.c (modified) (1 diff)
• dmd2/attrib.c (modified) (1 diff)
• gen/classes.cpp (modified) (5 diffs)
• ir/irstruct.h (modified) (1 diff)

dmd/attrib.c

@@ -33 +33 @@
-
-#include "../gen/enums.h"
-#include "../gen/logger.h"
-
-extern void obj_includelib(const char *name);

dmd2/attrib.c

@@ -33 +33 @@
-
-#include "../gen/enums.h"
-#include "../gen/logger.h"
-
-extern void obj_includelib(const char *name);

gen/classes.cpp

@@ -52 +52 @@
-    else
-        irstruct->interfaceMap.insert(std::make_pair(b->base, iri));
+
-    // add to ordered list
-    irstruct->interfaceVec.push_back(iri);
+
+    // add to classinfo interfaces
+    if (newinstance)
+        irstruct->classInfoInterfaces.push_back(iri);
-
-    // assign this iri to all base interfaces of this one
@@ -149 +154 @@
-            IrInterface* iri = new IrInterface(bc);
-            irstruct->interfaceVec.push_back(iri);
+            irstruct->classInfoInterfaces.push_back(iri);
-        }
-    }
@@ -379 +385 @@
-    // interface vtables
-    unsigned idx = 0;
-
-    for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
-    {
@@ -393 +398 @@
-        iri->vtbl = new llvm::GlobalVariable(iri->vtblInitTy.get(), true, _linkage, 0, nam, gIR->module);
-
-create interfaceinfos
+set the interface info as it's need as the first vtbl entry
-        LLConstant* idxs[2] = {DtoConstUint(0), DtoConstUint(idx)};
-        iri->info = llvm::ConstantExpr::getGetElementPtr(irstruct->interfaceInfos, idxs, 2);
@@ -1507 +1512 @@
-    else {
-        const LLType* t = intersTy->getContainedType(1); // .ptr
+        // cast to Interface*
-        c = DtoBitCast(ir->interfaceInfos, t);
-
+
+
+
+
+
+
+
-        c = DtoConstSlice(DtoConstSize_t(iisz), c);
-    }

ir/irstruct.h

@@ -143 +143 @@
-    bool classInfoDeclared;
-    bool classInfoDefined;
+    // vector of interfaces that should be put in ClassInfo.interfaces
+    InterfaceVector classInfoInterfaces;
-
-    // align(1) struct S { ... }