Commit d20ad1c7 authored by Russ Cox's avatar Russ Cox

gc: change -u to require imports to be marked safe

R=ken2
CC=golang-dev
https://golang.org/cl/1597043
parent fe43325b
......@@ -268,7 +268,10 @@ dumpexport(void)
packagequotes = 1;
Bprint(bout, "\n$$ // exports\n");
Bprint(bout, " package %s\n", localpkg->name);
Bprint(bout, " package %s", localpkg->name);
if(safemode)
Bprint(bout, " safe");
Bprint(bout, "\n");
for(l=exportlist; l; l=l->next) {
lineno = l->n->lineno;
......
......@@ -578,6 +578,7 @@ struct Io
int peekc;
int peekc1; // second peekc for ...
char* cp; // used for content when bin==nil
int importsafe;
};
typedef struct Dlist Dlist;
......
......@@ -152,6 +152,7 @@ loadsys:
cannedimports("runtime.builtin", "package runtime\n\n$$\n\n");
else
cannedimports("runtime.builtin", runtimeimport);
curio.importsafe = 1;
}
import_package
import_there
......@@ -236,10 +237,13 @@ import_here:
}
import_package:
LPACKAGE sym ';'
LPACKAGE sym import_safety ';'
{
importpkg->name = $2->name;
importpkg->direct = 1;
if(safemode && !curio.importsafe)
yyerror("cannot import unsafe package %Z", importpkg->path);
// NOTE(rsc): This is no longer a technical restriction:
// the 6g tool chain would work just fine without giving
......@@ -250,6 +254,13 @@ import_package:
yyerror("cannot import package main");
}
import_safety:
| LNAME
{
if(strcmp($1->name, "safe") == 0)
curio.importsafe = 1;
}
import_there:
{
defercheckwidth();
......
......@@ -442,6 +442,7 @@ cannedimports(char *file, char *cp)
curio.infile = file;
curio.cp = cp;
curio.nlsemi = 0;
curio.importsafe = 0;
typecheckok = 1;
incannedimport = 1;
......
......@@ -1191,7 +1191,10 @@ ret:
checkwidth(t);
}
}
if(safemode && isptrto(t, TANY))
// TODO(rsc): should not need to check importpkg,
// but reflect mentions unsafe.Pointer.
if(safemode && !incannedimport && !importpkg && isptrto(t, TANY))
yyerror("cannot use unsafe.Pointer");
evconst(n);
......
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