qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 18:54:42 -07:00
Code Releases Activity

internal/lsp/cache: handle a nil pointer exception in analysis

Browse Source 
Updates golang/go#35339

Change-Id: I2611b1a61bcf777fe4ce0f5446d1897c5698af86
Reviewed-on: https://go-review.googlesource.com/c/tools/+/205859
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Rebecca Stambler 2019-11-07 13:35:46 -05:00
parent f7ea15e60b
commit b93886dd8b
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/lsp/cache/analysis.go vendored
View File

@ -148,6 +148,9 @@ func (act *actionHandle) analyze(ctx context.Context) ([]*source.Error, interfac
if !ok { if !ok {
return nil, nil, errors.Errorf("unexpected type for %s:%s", act.pkg.ID(), act.analyzer.Name) return nil, nil, errors.Errorf("unexpected type for %s:%s", act.pkg.ID(), act.analyzer.Name)
} }
if data == nil {
return nil, nil, errors.Errorf("unexpected nil analysis for %s:%s", act.pkg.ID(), act.analyzer.Name)
}
return data.diagnostics, data.result, data.err return data.diagnostics, data.result, data.err
} }
@ -160,6 +163,9 @@ func (act *actionHandle) cached() ([]*source.Error, interface{}, error) {
if !ok { if !ok {
return nil, nil, errors.Errorf("unexpected type for %s:%s", act.pkg.ID(), act.analyzer.Name) return nil, nil, errors.Errorf("unexpected type for %s:%s", act.pkg.ID(), act.analyzer.Name)
} }
if data == nil {
return nil, nil, errors.Errorf("unexpected nil cached analysis for %s:%s", act.pkg.ID(), act.analyzer.Name)
}
return data.diagnostics, data.result, data.err return data.diagnostics, data.result, data.err
} }
@ -213,8 +219,6 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
// Plumb the output values of the dependencies // Plumb the output values of the dependencies
// into the inputs of this action. Also facts. // into the inputs of this action. Also facts.
inputs := make(map[*analysis.Analyzer]interface{}) inputs := make(map[*analysis.Analyzer]interface{})
objectFacts := make(map[objectFactKey]analysis.Fact)
packageFacts := make(map[packageFactKey]analysis.Fact)
for depHandle, depData := range deps { for depHandle, depData := range deps {
if depHandle.pkg == pkg { if depHandle.pkg == pkg {
@ -233,14 +237,14 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
if !exportedFrom(key.obj, depHandle.pkg.types) { if !exportedFrom(key.obj, depHandle.pkg.types) {
continue continue
} }
objectFacts[key] = fact data.objectFacts[key] = fact
} }
for key, fact := range depData.packageFacts { for key, fact := range depData.packageFacts {
// TODO: filter out facts that belong to // TODO: filter out facts that belong to
// packages not mentioned in the export data // packages not mentioned in the export data
// to prevent side channels. // to prevent side channels.
packageFacts[key] = fact data.packageFacts[key] = fact
} }
} }
} }
@ -271,7 +275,7 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
} }
key := objectFactKey{obj, factType(ptr)} key := objectFactKey{obj, factType(ptr)}
if v, ok := objectFacts[key]; ok { if v, ok := data.objectFacts[key]; ok {
reflect.ValueOf(ptr).Elem().Set(reflect.ValueOf(v).Elem()) reflect.ValueOf(ptr).Elem().Set(reflect.ValueOf(v).Elem())
return true return true
} }
@ -283,14 +287,14 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
analyzer, pkg.ID(), obj, fact)) analyzer, pkg.ID(), obj, fact))
} }
key := objectFactKey{obj, factType(fact)} key := objectFactKey{obj, factType(fact)}
objectFacts[key] = fact // clobber any existing entry data.objectFacts[key] = fact // clobber any existing entry
}, },
ImportPackageFact: func(pkg *types.Package, ptr analysis.Fact) bool { ImportPackageFact: func(pkg *types.Package, ptr analysis.Fact) bool {
if pkg == nil { if pkg == nil {
panic("nil package") panic("nil package")
} }
key := packageFactKey{pkg, factType(ptr)} key := packageFactKey{pkg, factType(ptr)}
if v, ok := packageFacts[key]; ok { if v, ok := data.packageFacts[key]; ok {
reflect.ValueOf(ptr).Elem().Set(reflect.ValueOf(v).Elem()) reflect.ValueOf(ptr).Elem().Set(reflect.ValueOf(v).Elem())
return true return true
} }
@ -298,19 +302,19 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
}, },
ExportPackageFact: func(fact analysis.Fact) { ExportPackageFact: func(fact analysis.Fact) {
key := packageFactKey{pkg.types, factType(fact)} key := packageFactKey{pkg.types, factType(fact)}
packageFacts[key] = fact // clobber any existing entry data.packageFacts[key] = fact // clobber any existing entry
}, },
AllObjectFacts: func() []analysis.ObjectFact { AllObjectFacts: func() []analysis.ObjectFact {
facts := make([]analysis.ObjectFact, 0, len(objectFacts)) facts := make([]analysis.ObjectFact, 0, len(data.objectFacts))
for k := range objectFacts { for k := range data.objectFacts {
facts = append(facts, analysis.ObjectFact{Object: k.obj, Fact: objectFacts[k]}) facts = append(facts, analysis.ObjectFact{Object: k.obj, Fact: data.objectFacts[k]})
} }
return facts return facts
}, },
AllPackageFacts: func() []analysis.PackageFact { AllPackageFacts: func() []analysis.PackageFact {
facts := make([]analysis.PackageFact, 0, len(packageFacts)) facts := make([]analysis.PackageFact, 0, len(data.packageFacts))
for k := range packageFacts { for k := range data.packageFacts {
facts = append(facts, analysis.PackageFact{Package: k.pkg, Fact: packageFacts[k]}) facts = append(facts, analysis.PackageFact{Package: k.pkg, Fact: data.packageFacts[k]})
} }
return facts return facts
}, },
@ -341,7 +345,8 @@ func runAnalysis(ctx context.Context, fset *token.FileSet, analyzer *analysis.An
for _, diag := range diagnostics { for _, diag := range diagnostics {
srcErr, err := sourceError(ctx, fset, pkg, diag) srcErr, err := sourceError(ctx, fset, pkg, diag)
if err != nil { if err != nil {
return nil data.err = err
return data
} }
data.diagnostics = append(data.diagnostics, srcErr) data.diagnostics = append(data.diagnostics, srcErr)
} }