Changeset 802:28ce72c60a21

Timestamp:

11/29/08 14:57:52 (1 month ago)

Author:

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

branch:

default

Message:

Fixed some problems with the addZeros forward declarations having type mismatches.

Files:

• gen/classes.cpp (modified) (2 diffs)
• gen/structs.cpp (modified) (1 diff)
• gen/toir.cpp (modified) (2 diffs)
• ir/irstruct.cpp (modified) (1 diff)
• ir/irstruct.h (modified) (1 diff)

gen/classes.cpp

@@ -421 +421 @@
-        DtoTypeInfoOf(cd->type, false);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void addZeros(std::vector<llvm::Constant*>& inits, size_t pos, size_t offset); // irstruct.cpp
-
-//////////////////////////////////////////////////////////////////////////////
@@ -548 +544 @@
-        assert(fd);
-
+        // if function is abstract,
+        // or class is abstract, and func has no body,
+        // emit a null vtbl entry
-        if (fd->isAbstract() || (cd->isAbstract() && !fd->fbody))
-        {

gen/structs.cpp

@@ -19 +19 @@
-
-//////////////////////////////////////////////////////////////////////////////////////////
-void addZeros(std::vector<llvm::Constant*>& inits, unsigned pos, unsigned offset); // defined in irstruct.cpp
-
-// pair of var and its init

gen/toir.cpp

@@ -2278 +2278 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void addZeros(std::vector<llvm::Value*>& inits, unsigned pos, unsigned offset);
-
-DValue* StructLiteralExp::toElem(IRState* p)
-{
@@ -2362 +2360 @@
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void addZeros(std::vector<llvm::Constant*>& inits, unsigned pos, unsigned offset);
-
-LLConstant* StructLiteralExp::toConstElem(IRState* p)

ir/irstruct.cpp

@@ -120 +120 @@
-
-//////////////////////////////////////////
-
-void addZeros(std::vector<const llvm::Type*>& inits, size_t pos, size_t offset);
-
-void IrStruct::addVar(VarDeclaration * var)

ir/irstruct.h

@@ -8 +8 @@
-
-struct IrInterface;
+
+void addZeros(std::vector<const llvm::Type*>& inits, size_t pos, size_t offset);
+void addZeros(std::vector<llvm::Constant*>& inits, size_t pos, size_t offset);
+void addZeros(std::vector<llvm::Value*>& inits, size_t pos, size_t offset);
-
-//////////////////////////////////////////////////////////////////////////////