Changeset 761:fa306ca8843b

Timestamp:

11/11/08 20:30:28 (2 months ago)

Author:

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

branch:

default

Message:

Applied fvbommel's patch from #112
Added missing TypeInfoInvariant? codegen for D2

Files:

• dmd/root.c (modified) (3 diffs)
• dmd2/root.c (modified) (3 diffs)
• gen/typinf.cpp (modified) (1 diff)

dmd/root.c

@@ -1614 +1614 @@
-    int count;
-
+    // On some platforms (i.e. x86_64) va_list is an array and thus passed by
+    // reference. Copy the input list so we can copy it back before retrying.
+    va_list orig_args;
+    va_copy(orig_args, args);
+
-    p = buffer;
-    psize = sizeof(buffer);
@@ -1623 +1628 @@
-        break;
-    psize *= 2;
-
-
+
-    count = vsnprintf(p,psize,format,args);
-    if (count == -1)
@@ -1633 +1637 @@
-        break;
-#endif
+    va_copy(args, orig_args);
-    p = (char *) alloca(psize); // buffer too small, try again with larger size
-    }

dmd2/root.c

@@ -1614 +1614 @@
-    int count;
-
+    // On some platforms (i.e. x86_64) va_list is an array and thus passed by
+    // reference. Copy the input list so we can copy it back before retrying.
+    va_list orig_args;
+    va_copy(orig_args, args);
+
-    p = buffer;
-    psize = sizeof(buffer);
@@ -1623 +1628 @@
-        break;
-    psize *= 2;
-
-
+
-    count = vsnprintf(p,psize,format,args);
-    if (count == -1)
@@ -1633 +1637 @@
-        break;
-#endif
+    va_copy(args, orig_args);
-    p = (char *) alloca(psize); // buffer too small, try again with larger size
-    }

gen/typinf.cpp

@@ -1230 +1230 @@
-}
-
-// void TypeInfoConstDeclaration::toDt(dt_t **pdt)
-// {
-//     //printf("TypeInfoConstDeclaration::toDt() %s\n", toChars());
-//     dtxoff(pdt, Type::typeinfoconst->toVtblSymbol(), 0, TYnptr); // vtbl for TypeInfo_Const
-//     dtdword(pdt, 0);                // monitor
-//     Type *tm = tinfo->mutableOf();
-//     tm = tm->merge();
-//     tm->getTypeInfo(NULL);
-//     dtxoff(pdt, tm->vtinfo->toSymbol(), 0, TYnptr);
-// }
-
-///////////////////////////////////////////////////////////
-
-/* ========================================================================= */
-
+void TypeInfoInvariantDeclaration::llvmDeclare()
+{
+    Logger::println("TypeInfoInvariantDeclaration::toDt() %s", toChars());
+    LOG_SCOPE;
+
+    LLVM_D_Declare_TypeInfoBase(this, Type::typeinfoinvariant);
+}
+
+void TypeInfoInvariantDeclaration::llvmDefine()
+{
+    Logger::println("TypeInfoInvariantDeclaration::toDt() %s", toChars());
+    LOG_SCOPE;
+
+    Type *tm = tinfo->mutableOf();
+    tm = tm->merge();
+
+    LLVM_D_Define_TypeInfoBase(tm, this, Type::typeinfoinvariant);
+}
+
-void TypeInfoInvariantDeclaration::toDt(dt_t **pdt)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#endif