[Swig-cvs] SF.net SVN: swig:[13154] trunk/Source/Modules/go.cxx

[<ian...@us...>]

Revision: 13154
          http://swig.svn.sourceforge.net/swig/?rev=13154&view=rev
Author:   ianlancetaylor
Date:     2012-06-05 23:02:42 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Don't convert uintptr to interface type while not connected to Go
scheduler.  Likewise with calls to defer.

Modified Paths:
--------------
    trunk/Source/Modules/go.cxx

Modified: trunk/Source/Modules/go.cxx
===================================================================
--- trunk/Source/Modules/go.cxx	2012-06-05 20:54:08 UTC (rev 13153)
+++ trunk/Source/Modules/go.cxx	2012-06-05 23:02:42 UTC (rev 13154)
@@ -952,13 +952,32 @@
       }
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	if (!is_constructor) {
+	  Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	  Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	} else {
+	  // For a constructor the wrapper function will return a
+	  // uintptr but we will return an interface.  We want to
+	  // convert the uintptr to the interface after calling
+	  // SwigCgocallDone, so that we don't try to allocate memory
+	  // while the Go scheduler can't see us.
+	  Printv(f_go_wrappers, "\tvar done bool\n", NULL);
+	  Printv(f_go_wrappers, "\tdefer func() {\n", NULL);
+	  Printv(f_go_wrappers, "\t\tif !done {\n", NULL);
+	  Printv(f_go_wrappers, "\t\t\tSwigCgocallDone()\n", NULL);
+	  Printv(f_go_wrappers, "\t\t}\n", NULL);
+	  Printv(f_go_wrappers, "\t}()\n", NULL);
+	  Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	}
       }
 
       Printv(f_go_wrappers, "\t", NULL);
       if (SwigType_type(result) != T_VOID) {
-	Printv(f_go_wrappers, "return ", NULL);
+	if (gccgo_flag && is_constructor) {
+	  Printv(f_go_wrappers, "swig_r := ", NULL);
+	} else {
+	  Printv(f_go_wrappers, "return ", NULL);
+	}
       }
 
       Printv(f_go_wrappers, wrapper_name, "(", NULL);
@@ -994,6 +1013,13 @@
 	p = nextParm(p);
       }
       Printv(f_go_wrappers, ")\n", NULL);
+
+      if (gccgo_flag && is_constructor) {
+	Printv(f_go_wrappers, "\tSwigCgocallDone()\n", NULL);
+	Printv(f_go_wrappers, "\tdone = true\n", NULL);
+	Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
+      }
+
       Printv(f_go_wrappers, "}\n", NULL);
     }
 
@@ -2549,8 +2575,8 @@
       Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
 
       if (gccgo_flag) {
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
 	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\tp.", class_receiver, " = ", fn_name, NULL);
@@ -3084,8 +3110,8 @@
       Printv(f_go_wrappers, "\t}\n", NULL);
 
       if (gccgo_flag) {
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
 	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);
@@ -3234,8 +3260,8 @@
       Printv(f_go_wrappers, " {\n", NULL);
 
       if (gccgo_flag) {
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
 	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.