remove asserts from properties on Val (#5032)

Author: dsyme

src/fsharp/Optimizer.fs

@@ -134,14 +134,15 @@ type ValInfos(entries) =
         lazy (
             let dict = Dictionary<_, _>()
             for (vref, _x) as p in entries do 
-                dict.Add(vref.Deref.LinkagePartialKey, p) |> ignore
+                let vkey = vref.Deref.GetLinkagePartialKey()
+                dict.Add(vkey, p) |> ignore
             dict)
 
     member x.Entries = valInfoTable.Force().Values
     member x.Map f = ValInfos(Seq.map f x.Entries)
     member x.Filter f = ValInfos(Seq.filter f x.Entries)
     member x.TryFind (v:ValRef) = valInfoTable.Force().TryFind v.Deref
-    member x.TryFindForFslib (v:ValRef) = valInfosForFslib.Force().TryGetValue(v.Deref.LinkagePartialKey)
+    member x.TryFindForFslib (v:ValRef) = valInfosForFslib.Force().TryGetValue(v.Deref.GetLinkagePartialKey())
 
 type ModuleInfo = 
     { ValInfos: ValInfos

src/fsharp/SignatureConformance.fs

@@ -551,9 +551,11 @@ type Checker(g, amap, denv, remapInfo: SignatureRepackageInfo, checkingSig) =
                        Printf.bprintf os "%s" fx.DisplayName),m))
 
             let valuesPartiallyMatch (av:Val) (fv:Val) =
-                (av.LinkagePartialKey.MemberParentMangledName = fv.LinkagePartialKey.MemberParentMangledName) &&
-                (av.LinkagePartialKey.LogicalName = fv.LinkagePartialKey.LogicalName) &&
-                (av.LinkagePartialKey.TotalArgCount = fv.LinkagePartialKey.TotalArgCount)    
+                let akey = av.GetLinkagePartialKey()
+                let fkey = fv.GetLinkagePartialKey()
+                (akey.MemberParentMangledName = fkey.MemberParentMangledName) &&
+                (akey.LogicalName = fkey.LogicalName) &&
+                (akey.TotalArgCount = fkey.TotalArgCount)    
 
             (implModType.AllValsAndMembersByLogicalNameUncached, signModType.AllValsAndMembersByLogicalNameUncached)
               ||> NameMap.suball2 

src/fsharp/TastOps.fs

@@ -3809,13 +3809,14 @@ let accSubEntityRemap (msigty:ModuleOrNamespaceType) (entity:Entity) (mrpi, mhi)
         (mrpi, mhi) 
 
 let valLinkageAEquiv g aenv (v1:Val) (v2:Val) = 
-    (v1.LinkagePartialKey = v2.LinkagePartialKey) &&
+    (v1.GetLinkagePartialKey() = v2.GetLinkagePartialKey()) &&
     (if v1.IsMember && v2.IsMember then typeAEquivAux EraseAll g aenv v1.Type v2.Type else true)
 
 let accValRemap g aenv (msigty:ModuleOrNamespaceType) (implVal:Val) (mrpi, mhi) =
+    let implValKey = implVal.GetLinkagePartialKey()
     let sigValOpt = 
         msigty.AllValsAndMembersByPartialLinkageKey 
-          |> MultiMap.find implVal.LinkagePartialKey 
+          |> MultiMap.find implValKey
           |> List.tryFind (fun sigVal -> valLinkageAEquiv g aenv implVal sigVal)
 
     let vref = mkLocalValRef implVal

src/fsharp/tast.fs

@@ -979,14 +979,14 @@ and /// Represents a type definition, exception definition, module definition or
     member x.FSharpObjectModelTypeInfo = 
          match x.TypeReprInfo with 
          | TFSharpObjectRepr x -> x 
-         |  _ -> assert false; failwith "not an F# object model type definition"
+         |  _ -> failwith "not an F# object model type definition"
 
     /// Indicate if this is a type definition backed by Abstract IL metadata.
     member x.IsILTycon = match x.TypeReprInfo with | TILObjectRepr _ -> true |  _ -> false
 
     /// Get the Abstract IL scope, nesting and metadata for this 
     /// type definition, assuming it is backed by Abstract IL metadata.
-    member x.ILTyconInfo = match x.TypeReprInfo with | TILObjectRepr data -> data |  _ -> assert false; failwith "not a .NET type definition"
+    member x.ILTyconInfo = match x.TypeReprInfo with | TILObjectRepr data -> data |  _ -> failwith "not a .NET type definition"
 
     /// Get the Abstract IL metadata for this type definition, assuming it is backed by Abstract IL metadata.
     member x.ILTyconRawMetadata = let (TILObjectReprData(_,_,td)) = x.ILTyconInfo in td
@@ -1386,7 +1386,7 @@ and
 
     member info.BaseTypeForErased (m,objTy) = 
        if info.IsErased then info.LazyBaseType.Force (m,objTy) 
-       else assert false; failwith "expect erased type"
+       else failwith "expect erased type"
 
     override x.ToString() = "TProvidedTypeInfo(...)"
 
@@ -1784,7 +1784,8 @@ and [<Sealed>] ModuleOrNamespaceType(kind: ModuleOrNamespaceKind, vals: QueueLis
     member mtyp.AllValsAndMembersByPartialLinkageKey = 
         let addValByMangledName (x:Val) tab = 
            if x.IsCompiledAsTopLevel then
-               MultiMap.add x.LinkagePartialKey x tab 
+               let key = x.GetLinkagePartialKey()
+               MultiMap.add key x tab 
            else
                tab
         cacheOptRef allValsAndMembersByPartialLinkageKeyCache (fun () -> 
@@ -2458,18 +2459,18 @@ and [<StructuredFormatDisplay("{LogicalName}")>]
     member x.IsCompiledAsTopLevel       = x.ValReprInfo.IsSome 
 
     /// The partial information used to index the methods of all those in a ModuleOrNamespace.
-    member x.LinkagePartialKey : ValLinkagePartialKey = 
+    member x.GetLinkagePartialKey() : ValLinkagePartialKey = 
         assert x.IsCompiledAsTopLevel
         { LogicalName = x.LogicalName 
           MemberParentMangledName = (if x.IsMember then Some x.MemberApparentEntity.LogicalName else None)
           MemberIsOverride = x.IsOverrideOrExplicitImpl
           TotalArgCount = if x.IsMember then x.ValReprInfo.Value.TotalArgCount else 0 }
 
     /// The full information used to identify a specific overloaded method amongst all those in a ModuleOrNamespace.
-    member x.LinkageFullKey : ValLinkageFullKey = 
+    member x.GetLinkageFullKey() : ValLinkageFullKey = 
         assert x.IsCompiledAsTopLevel
-        ValLinkageFullKey(x.LinkagePartialKey, (if x.IsMember then Some x.Type else None))
-
+        let key = x.GetLinkagePartialKey()
+        ValLinkageFullKey(key, (if x.IsMember then Some x.Type else None))
 
     /// Is this a member definition or module definition?
     member x.IsMemberOrModuleBinding    = x.val_flags.IsMemberOrModuleBinding
@@ -2653,7 +2654,7 @@ and [<StructuredFormatDisplay("{LogicalName}")>]
         | Parent eref -> 
             match eref.PublicPath with 
             | None -> None
-            | Some p -> Some(ValPubPath(p,x.LinkageFullKey))
+            | Some p -> Some(ValPubPath(p,x.GetLinkageFullKey()))
         | ParentNone -> 
             None
 
@@ -4986,7 +4987,9 @@ let mkNonLocalCcuRootEntityRef ccu (x:Entity) = mkNonLocalTyconRefPreResolved x
 let mkNestedValRef  (cref:EntityRef) (v:Val) : ValRef = 
     match cref with 
     | ERefLocal _ -> mkLocalValRef v
-    | ERefNonLocal nlr -> mkNonLocalValRefPreResolved v nlr v.LinkageFullKey
+    | ERefNonLocal nlr -> 
+        let key = v.GetLinkageFullKey()
+        mkNonLocalValRefPreResolved v nlr key
 
 /// From Ref_private to Ref_nonlocal when exporting data.
 let rescopePubPathToParent viewedCcu (PubPath(p)) = NonLocalEntityRef(viewedCcu, p.[0..p.Length-2])