Commitb91327c

authored

Fix 1587 Internal error: TopValActualParent: does not have a parent (#3017)

* add library-only build and test* Fix 1587 Internal error: TopValActualParent: does not have a parent* fix tests* Fix tests

1 parentd4c637d commitb91327cCopy full SHA for b91327c

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7126,7 +7126,7 @@ let XmlDocSigOfVal g path (v:Val) =`
`7126`	`7126`	`\| MemberKind.PropertyGetSet`
`7127`	`7127`	`\| MemberKind.PropertySet`
`7128`	`7128`	`\| MemberKind.PropertyGet->"P:",v.PropertyName`
`7129`		`-letpath= prependPath path v.TopValActualParent.CompiledName`
	`7129`	`+letpath=if v.HasTopValActualParentthenprependPath path v.TopValActualParent.CompiledNameelse path`
`7130`	`7130`	`letparentTypars,methTypars=`
`7131`	`7131`	`match PartitionValTypars g vwith`
`7132`	`7132`	`\| Some(_,memberParentTypars,memberMethodTypars,_,_)-> memberParentTypars,memberMethodTypars`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -874,7 +874,7 @@ type MethInfo =`
`874`	`874`	`memberx.DeclaringEntityRef=`
`875`	`875`	`match xwith`
`876`	`876`	`\| ILMeth(_,ilminfo,_)when x.IsExtensionMember-> ilminfo.DeclaringTyconRef`
`877`		`-\| FSMeth(_,_,vref,_)when x.IsExtensionMember-> vref.TopValActualParent`
	`877`	`+\| FSMeth(_,_,vref,_)when x.IsExtensionMember&& vref.HasTopValActualParent-> vref.TopValActualParent`
`878`	`878`	`\|_-> tcrefOfAppTy x.TcGlobals x.EnclosingType`
`879`	`879`
`880`	`880`	`/// Get the information about provided static parameters, if any`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ module internal SymbolHelpers =`
`508`	`508`	`letGetXmlDocSigOfScopedValRef g(tcref:TyconRef)(vref:ValRef)=`
`509`	`509`	`letccuFileName= libFileOfEntityRef tcref`
`510`	`510`	`letv= vref.Deref`
`511`		`-if v.XmlDocSig=""then`
	`511`	`+if v.XmlDocSig=""&& v.HasTopValActualParentthen`
`512`	`512`	`v.XmlDocSig<- XmlDocSigOfVal g(buildAccessPath vref.TopValActualParent.CompilationPathOpt) v`
`513`	`513`	`Some(ccuFileName, v.XmlDocSig)`
`514`	`514`
`@@ -559,7 +559,7 @@ module internal SymbolHelpers =`
`559`	`559`	`ifnot vref.IsLocalRefthen`
`560`	`560`	`letccuFileName= vref.nlr.Ccu.FileName`
`561`	`561`	`letv= vref.Deref`
`562`		`-if v.XmlDocSig=""then`
	`562`	`+if v.XmlDocSig=""&& v.HasTopValActualParentthen`
`563`	`563`	`v.XmlDocSig<- XmlDocSigOfVal g vref.TopValActualParent.CompiledRepresentationForNamedType.Name v`
`564`	`564`	`Some(ccuFileName, v.XmlDocSig)`
`565`	`565`	`else`
`@@ -1294,7 +1294,7 @@ module internal SymbolHelpers =`
`1294`	`1294`	`match itemwith`
`1295`	`1295`	`\| Item.Value vref\| Item.CustomBuilder(_,vref)->`
`1296`	`1296`	`letv= vref.Deref`
`1297`		`-if v.IsModuleBindingthen`
	`1297`	`+if v.IsModuleBinding&& v.HasTopValActualParentthen`
`1298`	`1298`	`lettyconRef= v.TopValActualParent`
`1299`	`1299`	`letparamsString=`
`1300`	`1300`	`match v.Typarswith`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2420,6 +2420,11 @@ and [<StructuredFormatDisplay("{LogicalName}")>]`
`2420`	`2420`	`match x.ActualParentwith`
`2421`	`2421`	`\| Parent tcref-> tcref`
`2422`	`2422`	`\| ParentNone-> error(InternalError("TopValActualParent: does not have a parent",x.Range))`
	`2423`	`+`
	`2424`	`+memberx.HasTopValActualParent=`
	`2425`	`+match x.ActualParentwith`
	`2426`	`+\| Parent_->true`
	`2427`	`+\| ParentNone->false`
`2423`	`2428`
`2424`	`2429`	`/// Get the apparent parent entity for a member`
`2425`	`2430`	`memberx.MemberApparentParent:TyconRef=`
`@@ -3369,6 +3374,9 @@ and`
`3369`	`3374`	`/// is declared.`
`3370`	`3375`	`memberx.TopValActualParent= x.Deref.TopValActualParent`
`3371`	`3376`
	`3377`	`+// Can be false for members after error recovery`
	`3378`	`+memberx.HasTopValActualParent= x.Deref.HasTopValActualParent`
	`3379`	`+`
`3372`	`3380`	`/// Get the apparent parent entity for a member`
`3373`	`3381`	`memberx.MemberApparentParent= x.Deref.MemberApparentParent`
`3374`	`3382`

Comments

(0)