1
0
mirror of https://github.com/golang/go synced 2024-11-25 01:08:02 -07:00

cmd/gc: suspend safemode during typecheck of inlined bodies.

Should be obviously correct.  Includes minimal test case.
A future CL should clear up the logic around typecheckok and importpkg != nil someday.

R=rsc, dsymonds, rsc
CC=golang-dev
https://golang.org/cl/5652057
This commit is contained in:
Luuk van Dijk 2012-02-10 22:50:55 +01:00
parent fbab6d8512
commit e0b2ce3401
7 changed files with 115 additions and 7 deletions

View File

@ -53,22 +53,62 @@ static Node *inlfn; // function currently being inlined
static Node *inlretlabel; // target of the goto substituted in place of a return static Node *inlretlabel; // target of the goto substituted in place of a return
static NodeList *inlretvars; // temp out variables static NodeList *inlretvars; // temp out variables
// Lazy typechecking of imported bodies. // Get the function's package. For ordinary functions it's on the ->sym, but for imported methods
// TODO avoid redoing local functions (imporpkg would be wrong) // the ->sym can be re-used in the local package, so peel it off the receiver's type.
static Pkg*
fnpkg(Node *fn)
{
Type *rcvr;
if(fn->type->thistuple) {
// method
rcvr = getthisx(fn->type)->type->type;
if(isptr[rcvr->etype])
rcvr = rcvr->type;
if(!rcvr->sym)
fatal("receiver with no sym: [%S] %lN (%T)", fn->sym, fn, rcvr);
return rcvr->sym->pkg;
}
// non-method
return fn->sym->pkg;
}
// Lazy typechecking of imported bodies. For local functions, caninl will set ->typecheck
// because they're a copy of an already checked body.
void void
typecheckinl(Node *fn) typecheckinl(Node *fn)
{ {
Node *savefn; Node *savefn;
Pkg *pkg;
int save_safemode, lno;
if(fn->typecheck)
return;
lno = setlineno(fn);
if (debug['m']>2) if (debug['m']>2)
print("typecheck import [%S] %lN { %#H }\n", fn->sym, fn, fn->inl); print("typecheck import [%S] %lN { %#H }\n", fn->sym, fn, fn->inl);
// typecheckinl is only used for imported functions;
// their bodies may refer to unsafe as long as the package
// was marked safe during import (which was checked then).
pkg = fnpkg(fn);
if (pkg == localpkg || pkg == nil)
fatal("typecheckinl on local function %lN", fn);
save_safemode = safemode;
safemode = 0;
savefn = curfn; savefn = curfn;
curfn = fn; curfn = fn;
importpkg = fn->sym->pkg;
typechecklist(fn->inl, Etop); typechecklist(fn->inl, Etop);
importpkg = nil; fn->typecheck = 1;
curfn = savefn; curfn = savefn;
safemode = save_safemode;
lineno = lno;
} }
// Caninl determines whether fn is inlineable. Currently that means: // Caninl determines whether fn is inlineable. Currently that means:
@ -105,6 +145,8 @@ caninl(Node *fn)
fn->nname->inl = fn->nbody; fn->nname->inl = fn->nbody;
fn->nbody = inlcopylist(fn->nname->inl); fn->nbody = inlcopylist(fn->nname->inl);
// nbody will have been typechecked, so we can set this:
fn->typecheck = 1;
// hack, TODO, check for better way to link method nodes back to the thing with the ->inl // hack, TODO, check for better way to link method nodes back to the thing with the ->inl
// this is so export can find the body of a method // this is so export can find the body of a method
@ -444,12 +486,30 @@ inlnode(Node **np)
lineno = lno; lineno = lno;
} }
static void mkinlcall1(Node **np, Node *fn);
static void
mkinlcall(Node **np, Node *fn)
{
int save_safemode;
Pkg *pkg;
save_safemode = safemode;
// imported functions may refer to unsafe as long as the
// package was marked safe during import (already checked).
pkg = fnpkg(fn);
if(pkg != localpkg && pkg != nil)
safemode = 0;
mkinlcall1(np, fn);
safemode = save_safemode;
}
// if *np is a call, and fn is a function with an inlinable body, substitute *np with an OINLCALL. // if *np is a call, and fn is a function with an inlinable body, substitute *np with an OINLCALL.
// On return ninit has the parameter assignments, the nbody is the // On return ninit has the parameter assignments, the nbody is the
// inlined function body and list, rlist contain the input, output // inlined function body and list, rlist contain the input, output
// parameters. // parameters.
static void static void
mkinlcall(Node **np, Node *fn) mkinlcall1(Node **np, Node *fn)
{ {
int i; int i;
Node *n, *call, *saveinlfn, *as, *m; Node *n, *call, *saveinlfn, *as, *m;

View File

@ -11,6 +11,8 @@
== dwarf/ == dwarf/
== safe/
== fixedbugs/ == fixedbugs/
== bugs/ == bugs/

View File

@ -56,7 +56,7 @@ filterout() {
grep '^'"$2"'$' $1 >/dev/null grep '^'"$2"'$' $1 >/dev/null
} }
for dir in . ken chan interface syntax dwarf fixedbugs bugs for dir in . ken chan interface syntax dwarf safe fixedbugs bugs
do do
echo echo
echo '==' $dir'/' echo '==' $dir'/'

14
test/safe/main.go Normal file
View File

@ -0,0 +1,14 @@
// true
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
// can't use local path with -u, use -I. instead
import "pkg" // ERROR "import unsafe package"
func main() {
print(pkg.Float32bits(1.0))
}

8
test/safe/nousesafe.go Normal file
View File

@ -0,0 +1,8 @@
// $G $D/pkg.go && pack grc pkg.a pkg.$A 2> /dev/null && rm pkg.$A && errchk $G -I. -u $D/main.go
// rm -f pkg.a
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package ignored

16
test/safe/pkg.go Normal file
View File

@ -0,0 +1,16 @@
// true
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// a package that uses unsafe on the inside but not in it's api
package pkg
import "unsafe"
// this should be inlinable
func Float32bits(f float32) uint32 {
return *(*uint32)(unsafe.Pointer(&f))
}

8
test/safe/usesafe.go Normal file
View File

@ -0,0 +1,8 @@
// $G $D/pkg.go && pack grcS pkg.a pkg.$A 2> /dev/null && rm pkg.$A && $G -I. -u $D/main.go
// rm -f pkg.a
// Copyright 2012 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package ignored