Changeset 821:8f0b24bc55f0

Timestamp:

12/01/08 19:44:17 (1 month ago)

Author:

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

branch:

default

Message:

Added CMake option to disable generation of ClassInfo?.offTi arrays, defaults to OFF.

Files:

• CMakeLists.txt (modified) (2 diffs)
• gen/classes.cpp (modified) (4 diffs)
• tests/mini/classinfo3.d (modified) (2 diffs)

CMakeLists.txt

@@ -42 +42 @@
-set(D_VERSION 1 CACHE STRING "D language version")
-option(USE_BOEHM_GC "use the Boehm garbage collector internally")
+option(GENERATE_OFFTI "generate complete ClassInfo.offTi arrays")
-
-if(D_VERSION EQUAL 1)
@@ -143 +144 @@
-endif(USE_BOEHM_GC)
-
+if(GENERATE_OFFTI)
+    add_definitions(-DGENERATE_OFFTI)
+endif(GENERATE_OFFTI)
+
-if(CMAKE_MINOR_VERSION LESS 6)
-    set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "output dir for built executables")

gen/classes.cpp

@@ -1313 +1313 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
+#if GENERATE_OFFTI
+
-// build a single element for the OffsetInfo[] of ClassInfo
-static LLConstant* build_offti_entry(ClassDeclaration* cd, VarDeclaration* vd)
@@ -1371 +1373 @@
-    return DtoConstSlice(size, ptr);
-}
+
+#endif // GENERATE_OFFTI
-
-static LLConstant* build_class_dtor(ClassDeclaration* cd)
@@ -1582 +1586 @@
-    VarDeclaration* offTiVar = (VarDeclaration*)cinfo->fields.data[9];
-    const LLType* offTiTy = DtoType(offTiVar->type);
+
+#if GENERATE_OFFTI
+
-    if (cd->isInterfaceDeclaration())
-        c = LLConstant::getNullValue(offTiTy);
-    else
-        c = build_offti_array(cd, offTiTy);
+
+#else // GENERATE_OFFTI
+
+    c = LLConstant::getNullValue(offTiTy);
+
+#endif // GENERATE_OFFTI
+
-    inits.push_back(c);
-
@@ -1607 +1621 @@
-    // FIXME: fill it out!
-    inits.push_back( LLConstant::getNullValue(xgetTy) );
-
-#else
-#endif
-

tests/mini/classinfo3.d

@@ -12 +12 @@
-{
-    auto c = C.classinfo;
-
+
+
-    assert(c.offTi.length == 4);
-
@@ -25 +26 @@
-    assert(c.offTi[3].offset == base+16);
-    assert(c.offTi[3].ti == typeid(int));
+    }
-}