Commit 7d608db2 by Ian Lance Taylor

runtime: Fix GC flag in when allocating memory from cgo.

From-SVN: r204815
parent 18f429e2
...@@ -75,7 +75,7 @@ runtime_mallocgc(uintptr size, uintptr typ, uint32 flag) ...@@ -75,7 +75,7 @@ runtime_mallocgc(uintptr size, uintptr typ, uint32 flag)
runtime_exitsyscall(); runtime_exitsyscall();
m = runtime_m(); m = runtime_m();
incallback = true; incallback = true;
flag |= FlagNoGC; flag |= FlagNoInvokeGC;
} }
if(runtime_gcwaiting() && g != m->g0 && m->locks == 0 && !(flag & FlagNoInvokeGC)) { if(runtime_gcwaiting() && g != m->g0 && m->locks == 0 && !(flag & FlagNoInvokeGC)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment