summaryrefslogtreecommitdiff
path: root/src/cmd/gc
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-06-11 15:28:43 -0700
committerRuss Cox <rsc@golang.org>2010-06-11 15:28:43 -0700
commite303e7b8e30467f1ebdb58a5ee7ba9cbef77e9f9 (patch)
treee55d8daf1dc6c39de51e38af7ba58747bbd23025 /src/cmd/gc
parent6df8460f50aa7a3514926b0ea8e90e0a68c6529d (diff)
downloadgo-e303e7b8e30467f1ebdb58a5ee7ba9cbef77e9f9.tar.gz
gc: change -u to require imports to be marked safe
R=ken2 CC=golang-dev http://codereview.appspot.com/1597043
Diffstat (limited to 'src/cmd/gc')
-rw-r--r--src/cmd/gc/export.c5
-rw-r--r--src/cmd/gc/go.h1
-rw-r--r--src/cmd/gc/go.y13
-rw-r--r--src/cmd/gc/lex.c1
-rw-r--r--src/cmd/gc/typecheck.c5
5 files changed, 22 insertions, 3 deletions
diff --git a/src/cmd/gc/export.c b/src/cmd/gc/export.c
index 9992c5219..c73c476b6 100644
--- a/src/cmd/gc/export.c
+++ b/src/cmd/gc/export.c
@@ -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;
diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index 2cf408e76..2f63ba40f 100644
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -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;
diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index c7a1f111b..2c4623f15 100644
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -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();
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 5dc6d78cf..b08100993 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -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;
diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index 592166c88..70aa3cb9d 100644
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -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);