hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Go: Do not add dummy files to CompilationCompilingFilesTable

Browse Source
This commit is contained in:
Michael B. Gale
2024-02-13 14:21:07 +00:00
parent 5e08bf0dbf
commit be521508c2
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
go/extractor/extractor.go
View File

@@ -551,7 +551,7 @@ func (extraction *Extraction) extractError(tw *trap.Writer, err packages.Error,
log.Printf("Warning: failed to evaluate symlinks for %s", wd)
}
file = filepath.Join(ewd, "-")
extraction.extractFileInfo(tw, file)
extraction.extractFileInfo(tw, file, true)
} else {
var rawfile string
if parts := threePartPos.FindStringSubmatch(pos); parts != nil {
@@ -586,7 +586,7 @@ func (extraction *Extraction) extractError(tw *trap.Writer, err packages.Error,
file = afile
}
extraction.extractFileInfo(tw, file)
extraction.extractFileInfo(tw, file, false)
}
extraction.Lock.Lock()
@@ -655,7 +655,7 @@ func (extraction *Extraction) extractFile(ast *ast.File, pkg *packages.Package)
return err
}
extraction.extractFileInfo(tw, path)
extraction.extractFileInfo(tw, path, false)
extractScopes(tw, ast, pkg)
@@ -673,7 +673,7 @@ func (extraction *Extraction) extractFile(ast *ast.File, pkg *packages.Package)
// extractFileInfo extracts file-system level information for the given file, populating
// the `files` and `containerparent` tables
func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string) {
func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string, isDummy bool) {
// We may visit the same file twice because `extractError` calls this function to describe files containing
// compilation errors. It is also called for user source files being extracted.
extraction.Lock.Lock()
@@ -705,7 +705,9 @@ func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string) {
dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0))
extraction.Lock.Lock()
slbl := extraction.StatWriter.Labeler.FileLabelFor(file)
dbscheme.CompilationCompilingFilesTable.Emit(extraction.StatWriter, extraction.Label, extraction.GetFileIdx(file), slbl)
if !isDummy {
dbscheme.CompilationCompilingFilesTable.Emit(extraction.StatWriter, extraction.Label, extraction.GetFileIdx(file), slbl)
}
extraction.Lock.Unlock()
break
}

2
go/extractor/gomodextractor.go
View File

@@ -40,7 +40,7 @@ func (extraction *Extraction) extractGoMod(path string) error {
return err
}
extraction.extractFileInfo(tw, path)
extraction.extractFileInfo(tw, path, false)
file, err := os.Open(path)
if err != nil {