cmd: fix mismatched symbols

Change-Id: I6365cdf22ad5e669908519d0ee8b78d76ae8f1b9
Reviewed-on: https://go-review.googlesource.com/c/go/+/532075
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: shuang cui <imcusg@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
cui fliter 2023-10-02 15:09:26 +08:00 committed by Gopher Robot
parent 352c8835e7
commit 36b14a78b5
8 changed files with 8 additions and 8 deletions

View file

@ -18,7 +18,7 @@ from running applications or integration tests. E.g.
Run covdata via "go tool covdata <mode>", where 'mode' is a subcommand Run covdata via "go tool covdata <mode>", where 'mode' is a subcommand
selecting a specific reporting, merging, or data manipulation operation. selecting a specific reporting, merging, or data manipulation operation.
Descriptions on the various modes (run "go tool cover <mode> -help" for Descriptions on the various modes (run "go tool cover <mode> -help" for
specifics on usage of a given mode: specifics on usage of a given mode):
1. Report percent of statements covered in each profiled package 1. Report percent of statements covered in each profiled package

View file

@ -11,7 +11,7 @@ annotations to track which parts of each function are executed (this
is referred to "instrumentation"). Cover can operate in "legacy mode" is referred to "instrumentation"). Cover can operate in "legacy mode"
on a single Go source file at a time, or when invoked by the Go tool on a single Go source file at a time, or when invoked by the Go tool
it will process all the source files in a single package at a time it will process all the source files in a single package at a time
(package-scope instrumentation is enabled via "-pkgcfg" option, (package-scope instrumentation is enabled via "-pkgcfg" option).
When generated instrumented code, the cover tool computes approximate When generated instrumented code, the cover tool computes approximate
basic block information by studying the source. It is thus more basic block information by studying the source. It is thus more

View file

@ -972,7 +972,7 @@ func loadPackageData(ctx context.Context, path, parentPath, parentDir, parentRoo
// accepting them. // accepting them.
// //
// TODO(#41410: Figure out how this actually ought to work and fix // TODO(#41410: Figure out how this actually ought to work and fix
// this mess. // this mess).
} else { } else {
data.err = r.err data.err = r.err
} }

View file

@ -1088,7 +1088,7 @@ func updatePrunedRoots(ctx context.Context, direct map[string]bool, rs *Requirem
// relevant dependencies, and we explicitly don't want to pull in // relevant dependencies, and we explicitly don't want to pull in
// requirements on *irrelevant* requirements that happen to occur in the // requirements on *irrelevant* requirements that happen to occur in the
// go.mod files for these transitive-test-only dependencies. (See the test // go.mod files for these transitive-test-only dependencies. (See the test
// in mod_lazy_test_horizon.txt for a concrete example. // in mod_lazy_test_horizon.txt for a concrete example).
// //
// The “goldilocks zone” seems to be to spot-check exactly the same // The “goldilocks zone” seems to be to spot-check exactly the same
// modules that we promote to explicit roots: namely, those that provide // modules that we promote to explicit roots: namely, those that provide

View file

@ -753,7 +753,7 @@ func (c *ctxt0) aclass(a *obj.Addr) int {
if c.instoffset <= 0xfff { if c.instoffset <= 0xfff {
return C_ANDCON return C_ANDCON
} }
if c.instoffset&0xfff == 0 && isuint32(uint64(c.instoffset)) { // && (instoffset & (1<<31)) == 0) if c.instoffset&0xfff == 0 && isuint32(uint64(c.instoffset)) { // && ((instoffset & (1<<31)) == 0)
return C_UCON return C_UCON
} }
if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) { if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) {

View file

@ -718,7 +718,7 @@ func (c *ctxt0) aclass(a *obj.Addr) int {
if c.instoffset <= 0xffff { if c.instoffset <= 0xffff {
return C_ANDCON return C_ANDCON
} }
if c.instoffset&0xffff == 0 && isuint32(uint64(c.instoffset)) { /* && (instoffset & (1<<31)) == 0) */ if c.instoffset&0xffff == 0 && isuint32(uint64(c.instoffset)) { /* && (instoffset & (1<<31)) == 0) */
return C_UCON return C_UCON
} }
if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) { if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) {

View file

@ -691,7 +691,7 @@ func (c *ctxtz) aclass(a *obj.Addr) int {
if c.instoffset <= 0xffff { if c.instoffset <= 0xffff {
return C_ANDCON return C_ANDCON
} }
if c.instoffset&0xffff == 0 && isuint32(uint64(c.instoffset)) { /* && (instoffset & (1<<31)) == 0) */ if c.instoffset&0xffff == 0 && isuint32(uint64(c.instoffset)) { /* && (instoffset & (1<<31)) == 0) */
return C_UCON return C_UCON
} }
if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) { if isint32(c.instoffset) || isuint32(uint64(c.instoffset)) {

View file

@ -777,7 +777,7 @@ func (f *peFile) writeSymbols(ctxt *Link) {
// so the external linker see them as Forwarder RVA exports. See: // so the external linker see them as Forwarder RVA exports. See:
// //
// - https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#export-address-table // - https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#export-address-table
// - https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/pe-dll.c;h=e7b82ba6ffadf74dc1b9ee71dc13d48336941e51;hb=HEAD#l972) // - https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/pe-dll.c;h=e7b82ba6ffadf74dc1b9ee71dc13d48336941e51;hb=HEAD#l972
// //
// CL 317917 changes "." to ":" in symbols name, so these symbols can not be // CL 317917 changes "." to ":" in symbols name, so these symbols can not be
// found by external linker anymore. So a hacky way is adding the // found by external linker anymore. So a hacky way is adding the