mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
[dev.typeparams] merge master into dev.typeparams
On top of the merge, the following fixes were applied: + Debug["G"] changed to Debug.G, following golang.org/cl/263539. + issue42058a.go and issue42058b.go were skipped in types2/stdlib_test.go. go/types does not produce errors related to channel element size. Change-Id: I59fc84e12a2d728ef789fdc616f7afe80e451283
This commit is contained in:
Rob Findley
commit
5bfd2964a6
636 changed files with 20765 additions and 19446 deletions
|
|
@ -211,19 +211,28 @@ func Main(archInit func(*Arch)) {
|
|||
|
||||
flag.BoolVar(&compiling_runtime, "+", false, "compiling runtime")
|
||||
flag.BoolVar(&compiling_std, "std", false, "compiling standard library")
|
||||
objabi.Flagcount("%", "debug non-static initializers", &Debug['%'])
|
||||
objabi.Flagcount("B", "disable bounds checking", &Debug['B'])
|
||||
objabi.Flagcount("C", "disable printing of columns in error messages", &Debug['C']) // TODO(gri) remove eventually
|
||||
flag.StringVar(&localimport, "D", "", "set relative `path` for local imports")
|
||||
objabi.Flagcount("E", "debug symbol export", &Debug['E'])
|
||||
objabi.Flagcount("G", "accept generic code", &Debug['G'])
|
||||
|
||||
objabi.Flagcount("%", "debug non-static initializers", &Debug.P)
|
||||
objabi.Flagcount("B", "disable bounds checking", &Debug.B)
|
||||
objabi.Flagcount("C", "disable printing of columns in error messages", &Debug.C)
|
||||
objabi.Flagcount("E", "debug symbol export", &Debug.E)
|
||||
objabi.Flagcount("G", "accept generic code", &Debug.G)
|
||||
objabi.Flagcount("K", "debug missing line numbers", &Debug.K)
|
||||
objabi.Flagcount("L", "show full file names in error messages", &Debug.L)
|
||||
objabi.Flagcount("N", "disable optimizations", &Debug.N)
|
||||
objabi.Flagcount("S", "print assembly listing", &Debug.S)
|
||||
objabi.Flagcount("W", "debug parse tree after type checking", &Debug.W)
|
||||
objabi.Flagcount("e", "no limit on number of errors reported", &Debug.e)
|
||||
objabi.Flagcount("h", "halt on error", &Debug.h)
|
||||
objabi.Flagcount("j", "debug runtime-initialized variables", &Debug.j)
|
||||
objabi.Flagcount("l", "disable inlining", &Debug.l)
|
||||
objabi.Flagcount("m", "print optimization decisions", &Debug.m)
|
||||
objabi.Flagcount("r", "debug generated wrappers", &Debug.r)
|
||||
objabi.Flagcount("w", "debug type checking", &Debug.w)
|
||||
|
||||
objabi.Flagfn1("I", "add `directory` to import search path", addidir)
|
||||
objabi.Flagcount("K", "debug missing line numbers", &Debug['K'])
|
||||
objabi.Flagcount("L", "show full file names in error messages", &Debug['L'])
|
||||
objabi.Flagcount("N", "disable optimizations", &Debug['N'])
|
||||
objabi.Flagcount("S", "print assembly listing", &Debug['S'])
|
||||
objabi.AddVersionFlag() // -V
|
||||
objabi.Flagcount("W", "debug parse tree after type checking", &Debug['W'])
|
||||
flag.StringVar(&asmhdr, "asmhdr", "", "write assembly header to `file`")
|
||||
flag.StringVar(&buildid, "buildid", "", "record `id` as the build id in the export metadata")
|
||||
flag.IntVar(&nBackendWorkers, "c", 1, "concurrency during compilation, 1 means no concurrency")
|
||||
|
|
@ -232,17 +241,12 @@ func Main(archInit func(*Arch)) {
|
|||
flag.BoolVar(&flagDWARF, "dwarf", !Wasm, "generate DWARF symbols")
|
||||
flag.BoolVar(&Ctxt.Flag_locationlists, "dwarflocationlists", true, "add location lists to DWARF in optimized mode")
|
||||
flag.IntVar(&genDwarfInline, "gendwarfinl", 2, "generate DWARF inline info records")
|
||||
objabi.Flagcount("e", "no limit on number of errors reported", &Debug['e'])
|
||||
objabi.Flagcount("h", "halt on error", &Debug['h'])
|
||||
objabi.Flagfn1("importmap", "add `definition` of the form source=actual to import map", addImportMap)
|
||||
objabi.Flagfn1("importcfg", "read import configuration from `file`", readImportCfg)
|
||||
flag.StringVar(&flag_installsuffix, "installsuffix", "", "set pkg directory `suffix`")
|
||||
objabi.Flagcount("j", "debug runtime-initialized variables", &Debug['j'])
|
||||
objabi.Flagcount("l", "disable inlining", &Debug['l'])
|
||||
flag.StringVar(&flag_lang, "lang", "", "release to compile for")
|
||||
flag.StringVar(&linkobj, "linkobj", "", "write linker-specific object to `file`")
|
||||
objabi.Flagcount("live", "debug liveness analysis", &debuglive)
|
||||
objabi.Flagcount("m", "print optimization decisions", &Debug['m'])
|
||||
if sys.MSanSupported(objabi.GOOS, objabi.GOARCH) {
|
||||
flag.BoolVar(&flag_msan, "msan", false, "build code compatible with C/C++ memory sanitizer")
|
||||
}
|
||||
|
|
@ -250,7 +254,6 @@ func Main(archInit func(*Arch)) {
|
|||
flag.StringVar(&outfile, "o", "", "write output to `file`")
|
||||
flag.StringVar(&myimportpath, "p", "", "set expected package import `path`")
|
||||
flag.BoolVar(&writearchive, "pack", false, "write to file.a instead of file.o")
|
||||
objabi.Flagcount("r", "debug generated wrappers", &Debug['r'])
|
||||
if sys.RaceDetectorSupported(objabi.GOOS, objabi.GOARCH) {
|
||||
flag.BoolVar(&flag_race, "race", false, "enable race detector")
|
||||
}
|
||||
|
|
@ -260,7 +263,6 @@ func Main(archInit func(*Arch)) {
|
|||
}
|
||||
flag.StringVar(&pathPrefix, "trimpath", "", "remove `prefix` from recorded source file paths")
|
||||
flag.BoolVar(&Debug_vlog, "v", false, "increase debug verbosity")
|
||||
objabi.Flagcount("w", "debug type checking", &Debug['w'])
|
||||
flag.BoolVar(&use_writebarrier, "wb", true, "enable write barrier")
|
||||
var flag_shared bool
|
||||
var flag_dynlink bool
|
||||
|
|
@ -326,9 +328,9 @@ func Main(archInit func(*Arch)) {
|
|||
|
||||
Ctxt.Flag_shared = flag_dynlink || flag_shared
|
||||
Ctxt.Flag_dynlink = flag_dynlink
|
||||
Ctxt.Flag_optimize = Debug['N'] == 0
|
||||
Ctxt.Flag_optimize = Debug.N == 0
|
||||
|
||||
Ctxt.Debugasm = Debug['S']
|
||||
Ctxt.Debugasm = Debug.S
|
||||
Ctxt.Debugvlog = Debug_vlog
|
||||
if flagDWARF {
|
||||
Ctxt.DebugInfo = debuginfo
|
||||
|
|
@ -400,7 +402,7 @@ func Main(archInit func(*Arch)) {
|
|||
instrumenting = true
|
||||
}
|
||||
|
||||
if compiling_runtime && Debug['N'] != 0 {
|
||||
if compiling_runtime && Debug.N != 0 {
|
||||
log.Fatal("cannot disable optimizations while compiling runtime")
|
||||
}
|
||||
if nBackendWorkers < 1 {
|
||||
|
|
@ -505,11 +507,11 @@ func Main(archInit func(*Arch)) {
|
|||
}
|
||||
|
||||
// enable inlining. for now:
|
||||
// default: inlining on. (debug['l'] == 1)
|
||||
// -l: inlining off (debug['l'] == 0)
|
||||
// -l=2, -l=3: inlining on again, with extra debugging (debug['l'] > 1)
|
||||
if Debug['l'] <= 1 {
|
||||
Debug['l'] = 1 - Debug['l']
|
||||
// default: inlining on. (Debug.l == 1)
|
||||
// -l: inlining off (Debug.l == 0)
|
||||
// -l=2, -l=3: inlining on again, with extra debugging (Debug.l > 1)
|
||||
if Debug.l <= 1 {
|
||||
Debug.l = 1 - Debug.l
|
||||
}
|
||||
|
||||
if jsonLogOpt != "" { // parse version,destination from json logging optimization.
|
||||
|
|
@ -572,10 +574,10 @@ func Main(archInit func(*Arch)) {
|
|||
loadsys()
|
||||
|
||||
timings.Start("fe", "parse")
|
||||
lines := parseFiles(flag.Args(), Debug['G'] != 0)
|
||||
lines := parseFiles(flag.Args(), Debug.G != 0)
|
||||
timings.Stop()
|
||||
timings.AddEvent(int64(lines), "lines")
|
||||
if Debug['G'] != 0 {
|
||||
if Debug.G != 0 {
|
||||
// can only parse generic code for now
|
||||
if nerrors+nsavederrors != 0 {
|
||||
errorexit()
|
||||
|
|
@ -674,7 +676,7 @@ func Main(archInit func(*Arch)) {
|
|||
// Phase 5: Inlining
|
||||
timings.Start("fe", "inlining")
|
||||
if Debug_typecheckinl != 0 {
|
||||
// Typecheck imported function bodies if debug['l'] > 1,
|
||||
// Typecheck imported function bodies if Debug.l > 1,
|
||||
// otherwise lazily when used or re-exported.
|
||||
for _, n := range importlist {
|
||||
if n.Func.Inl != nil {
|
||||
|
|
@ -688,7 +690,7 @@ func Main(archInit func(*Arch)) {
|
|||
}
|
||||
}
|
||||
|
||||
if Debug['l'] != 0 {
|
||||
if Debug.l != 0 {
|
||||
// Find functions that can be inlined and clone them before walk expands them.
|
||||
visitBottomUp(xtop, func(list []*Node, recursive bool) {
|
||||
numfns := numNonClosures(list)
|
||||
|
|
@ -699,7 +701,7 @@ func Main(archInit func(*Arch)) {
|
|||
// across more than one function.
|
||||
caninl(n)
|
||||
} else {
|
||||
if Debug['m'] > 1 {
|
||||
if Debug.m > 1 {
|
||||
fmt.Printf("%v: cannot inline %v: recursive\n", n.Line(), n.Func.Nname)
|
||||
}
|
||||
}
|
||||
|
|
@ -976,9 +978,10 @@ func readSymABIs(file, myimportpath string) {
|
|||
if len(parts) != 3 {
|
||||
log.Fatalf(`%s:%d: invalid symabi: syntax is "%s sym abi"`, file, lineNum, parts[0])
|
||||
}
|
||||
sym, abi := parts[1], parts[2]
|
||||
if abi != "ABI0" { // Only supported external ABI right now
|
||||
log.Fatalf(`%s:%d: invalid symabi: unknown abi "%s"`, file, lineNum, abi)
|
||||
sym, abistr := parts[1], parts[2]
|
||||
abi, valid := obj.ParseABI(abistr)
|
||||
if !valid {
|
||||
log.Fatalf(`%s:%d: invalid symabi: unknown abi "%s"`, file, lineNum, abistr)
|
||||
}
|
||||
|
||||
// If the symbol is already prefixed with
|
||||
|
|
@ -991,9 +994,9 @@ func readSymABIs(file, myimportpath string) {
|
|||
|
||||
// Record for later.
|
||||
if parts[0] == "def" {
|
||||
symabiDefs[sym] = obj.ABI0
|
||||
symabiDefs[sym] = abi
|
||||
} else {
|
||||
symabiRefs[sym] = obj.ABI0
|
||||
symabiRefs[sym] = abi
|
||||
}
|
||||
default:
|
||||
log.Fatalf(`%s:%d: invalid symabi type "%s"`, file, lineNum, parts[0])
|
||||
|
|
@ -1415,29 +1418,34 @@ func IsAlias(sym *types.Sym) bool {
|
|||
return sym.Def != nil && asNode(sym.Def).Sym != sym
|
||||
}
|
||||
|
||||
// By default, assume any debug flags are incompatible with concurrent compilation.
|
||||
// A few are safe and potentially in common use for normal compiles, though; mark them as such here.
|
||||
var concurrentFlagOK = [256]bool{
|
||||
'B': true, // disabled bounds checking
|
||||
'C': true, // disable printing of columns in error messages
|
||||
'e': true, // no limit on errors; errors all come from non-concurrent code
|
||||
'I': true, // add `directory` to import search path
|
||||
'N': true, // disable optimizations
|
||||
'l': true, // disable inlining
|
||||
'w': true, // all printing happens before compilation
|
||||
'W': true, // all printing happens before compilation
|
||||
'S': true, // printing disassembly happens at the end (but see concurrentBackendAllowed below)
|
||||
// By default, assume any debug flags are incompatible with concurrent
|
||||
// compilation. A few are safe and potentially in common use for
|
||||
// normal compiles, though; return true for those.
|
||||
func concurrentFlagOk() bool {
|
||||
// Report whether any debug flag that would prevent concurrent
|
||||
// compilation is set, by zeroing out the allowed ones and then
|
||||
// checking if the resulting struct is zero.
|
||||
d := Debug
|
||||
d.B = 0 // disable bounds checking
|
||||
d.C = 0 // disable printing of columns in error messages
|
||||
d.e = 0 // no limit on errors; errors all come from non-concurrent code
|
||||
d.N = 0 // disable optimizations
|
||||
d.l = 0 // disable inlining
|
||||
d.w = 0 // all printing happens before compilation
|
||||
d.W = 0 // all printing happens before compilation
|
||||
d.S = 0 // printing disassembly happens at the end (but see concurrentBackendAllowed below)
|
||||
|
||||
return d == DebugFlags{}
|
||||
}
|
||||
|
||||
func concurrentBackendAllowed() bool {
|
||||
for i, x := range &Debug {
|
||||
if x != 0 && !concurrentFlagOK[i] {
|
||||
return false
|
||||
}
|
||||
if !concurrentFlagOk() {
|
||||
return false
|
||||
}
|
||||
// Debug['S'] by itself is ok, because all printing occurs
|
||||
|
||||
// Debug.S by itself is ok, because all printing occurs
|
||||
// while writing the object file, and that is non-concurrent.
|
||||
// Adding Debug_vlog, however, causes Debug['S'] to also print
|
||||
// Adding Debug_vlog, however, causes Debug.S to also print
|
||||
// while flushing the plist, which happens concurrently.
|
||||
if Debug_vlog || debugstr != "" || debuglive > 0 {
|
||||
return false
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue