jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't convert uintptr to interface type while not connected to Go

Browse source 
scheduler.  Likewise with calls to defer.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13154 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Ian Lance Taylor 2012-06-05 23:02:42 +00:00
commit 6a20df2bb8
1 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/Modules/go.cxx
View file

@ -952,13 +952,32 @@ private:
}
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 @@ private:
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 @@ private:
Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
if (gccgo_flag) {
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
}
Printv(f_go_wrappers, "\tp.", class_receiver, " = ", fn_name, NULL);
@ -3084,8 +3110,8 @@ private:
Printv(f_go_wrappers, "\t}\n", NULL);
if (gccgo_flag) {
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
}
Printv(f_go_wrappers, "\t", NULL);
@ -3234,8 +3260,8 @@ private:
Printv(f_go_wrappers, " {\n", NULL);
if (gccgo_flag) {
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
}
Printv(f_go_wrappers, "\t", NULL);