Merge pull request #3568 from yebblies/valisttype

Use correct type for va_list
dlang · May 23, 2014 · fa12d5b · fa12d5b
2 parents 3cd89e0 + c662153
commit fa12d5b
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 2 deletions.
diff --git a/src/mtype.c b/src/mtype.c
@@ -325,7 +325,7 @@ void Type::init()
 
     tvoidptr = tvoid->pointerTo();
     tstring = tchar->immutableOf()->arrayOf();
-    tvalist = tvoid->pointerTo();
+    tvalist = Target::va_listType();
 
     if (global.params.isLP64)
     {

diff --git a/src/target.c b/src/target.c
@@ -163,3 +163,30 @@ unsigned Target::critsecsize()
     return 0;
 }
 
+Type *Target::va_listType()
+{
+    if (global.params.isWindows)
+    {
+        return Type::tchar->pointerTo();
+    }
+    else if (global.params.isLinux ||
+             global.params.isFreeBSD ||
+             global.params.isOpenBSD ||
+             global.params.isSolaris ||
+             global.params.isOSX)
+    {
+        if (global.params.is64bit)
+        {
+            return (new TypeIdentifier(Loc(), Lexer::idPool("__va_list_tag")))->pointerTo();
+        }
+        else
+        {
+            return Type::tchar->pointerTo();
+        }
+    }
+    else
+    {
+        assert(0);
+        return NULL;
+    }
+}
diff --git a/src/target.h b/src/target.h
@@ -29,6 +29,7 @@ struct Target
     static unsigned alignsize(Type* type);
     static unsigned fieldalign(Type* type);
     static unsigned critsecsize();
+    static Type *va_listType();  // get type of va_list
 };
 
 #endif
diff --git a/test/runnable/cppa.d b/test/runnable/cppa.d
@@ -1,6 +1,7 @@
 // EXTRA_CPP_SOURCES: cppb.cpp
 
 import std.c.stdio;
+import core.stdc.stdarg;
 
 extern (C++)
         int foob(int i, int j, int k);
@@ -278,6 +279,37 @@ void test11()
 }
 /****************************************/
 
+char[100] valistbuffer;
+
+extern(C++) void myvprintfx(const(char)* format, va_list va)
+{
+    vsprintf(valistbuffer.ptr, format, va);
+}
+extern(C++) void myvprintf(const(char)*, va_list);
+extern(C++) void myprintf(const(char)* format, ...)
+{
+    va_list ap;
+    version(X86_64)
+    {
+        version(Windows)
+            va_start(ap, format);
+        else
+            va_start(ap, __va_argsave);
+    }
+    else
+        va_start(ap, format);
+    myvprintf(format, ap);
+    va_end(ap);
+}
+
+void testvalist()
+{
+    myprintf("hello %d", 999);
+    assert(valistbuffer[0..9] == "hello 999");
+}
+
+/****************************************/
+
 void main()
 {
     test1();
@@ -292,6 +324,7 @@ void main()
     test9();
     test10();
     test11();
+    testvalist();
 
     printf("Success\n");
 }
diff --git a/test/runnable/extra-files/cppb.cpp b/test/runnable/extra-files/cppb.cpp
@@ -212,3 +212,11 @@ namespace N11 { namespace M { void bar11() { } } }
 
 namespace A11 { namespace B { namespace C { void bar() { } } } }
 
+/**************************************/
+
+void myvprintfx(const char* format, va_list);
+
+void myvprintf(const char* format, va_list va)
+{
+    myvprintfx(format, va);
+}
diff --git a/test/runnable/imports/argufile.d b/test/runnable/imports/argufile.d
@@ -7,7 +7,7 @@ import std.stdio;
 import std.format;
 import std.utf;
 
-dstring formatstring(TypeInfo[] arguments, void *argptr) 
+dstring formatstring(TypeInfo[] arguments, va_list argptr)
 {
 
 	dstring message = null;