Skip to content

Commit 8a796ac

Browse files
KevinRansompsfinaki
KevinRansom
and
psfinaki
authored
Remove unused values from TcGlobals (#17422)
* initial * missing --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com>
1 parent fa3a96f commit 8a796ac

File tree

3 files changed

+1372
-46
lines changed

3 files changed

+1372
-46
lines changed

‎src/Compiler/FSharp.Compiler.Service.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
<Compile Include="TypedTree\TypedTree.fs" />
311311
<Compile Include="TypedTree\TypedTreeBasics.fsi" />
312312
<Compile Include="TypedTree\TypedTreeBasics.fs" />
313+
<Compile Include="TypedTree\TcGlobals.fsi" />
313314
<Compile Include="TypedTree\TcGlobals.fs" />
314315
<Compile Include="TypedTree\TypedTreeOps.fsi" />
315316
<Compile Include="TypedTree\TypedTreeOps.fs" />

‎src/Compiler/TypedTree/TcGlobals.fs‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,12 @@ type TcGlobals(
381381
let tryMkSysNonGenericTy path n = tryFindSysTyconRef path n |> Option.map mkNonGenericTy
382382

383383
let sys = ["System"]
384-
let sysLinq = ["System";"Linq"]
385384
let sysCollections = ["System";"Collections"]
386385
let sysGenerics = ["System";"Collections";"Generic"]
387386
let sysCompilerServices = ["System";"Runtime";"CompilerServices"]
388387

389388
let lazy_tcr = findSysTyconRef sys "Lazy`1"
390389
let v_fslib_IEvent2_tcr = mk_MFControl_tcref fslibCcu "IEvent`2"
391-
let v_tcref_IQueryable = findSysTyconRef sysLinq "IQueryable`1"
392390
let v_tcref_IObservable = findSysTyconRef sys "IObservable`1"
393391
let v_tcref_IObserver = findSysTyconRef sys "IObserver`1"
394392
let v_fslib_IDelegateEvent_tcr = mk_MFControl_tcref fslibCcu "IDelegateEvent`1"
@@ -789,7 +787,6 @@ type TcGlobals(
789787
let v_sbyte_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "sbyte" , None , Some "ToSByte", [vara], ([[varaTy]], v_sbyte_ty))
790788
let v_int16_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "int16" , None , Some "ToInt16", [vara], ([[varaTy]], v_int16_ty))
791789
let v_uint16_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "uint16" , None , Some "ToUInt16", [vara], ([[varaTy]], v_uint16_ty))
792-
let v_int_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "int" , None , Some "ToInt", [vara], ([[varaTy]], v_int_ty))
793790
let v_int32_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "int32" , None , Some "ToInt32", [vara], ([[varaTy]], v_int32_ty))
794791
let v_uint32_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "uint32" , None , Some "ToUInt32", [vara], ([[varaTy]], v_uint32_ty))
795792
let v_int64_operator_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "int64" , None , Some "ToInt64", [vara], ([[varaTy]], v_int64_ty))
@@ -876,7 +873,6 @@ type TcGlobals(
876873
let v_lazy_create_info = makeIntrinsicValRef(fslib_MFLazyExtensions_nleref, "Create" , Some "Lazy`1" , None , [vara], ([[v_unit_ty --> varaTy]], mkLazyTy varaTy))
877874

878875
let v_seq_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "seq" , None , Some "CreateSequence" , [vara], ([[mkSeqTy varaTy]], mkSeqTy varaTy))
879-
let v_refcell_info = makeIntrinsicValRef(fslib_MFCore_nleref, "ref" , Some "FSharpRef`1" , None , [vara], ([[mkRefCellTy varaTy]; []], varaTy))
880876
let v_splice_expr_info = makeIntrinsicValRef(fslib_MFExtraTopLevelOperators_nleref, "op_Splice" , None , None , [vara], ([[mkQuotedExprTy varaTy]], varaTy))
881877
let v_splice_raw_expr_info = makeIntrinsicValRef(fslib_MFExtraTopLevelOperators_nleref, "op_SpliceUntyped" , None , None , [vara], ([[mkRawQuotedExprTy]], varaTy))
882878
let v_new_decimal_info = makeIntrinsicValRef(fslib_MFIntrinsicFunctions_nleref, "MakeDecimal" , None , None , [], ([[v_int_ty]; [v_int_ty]; [v_int_ty]; [v_bool_ty]; [v_byte_ty]], v_decimal_ty))
@@ -897,7 +893,6 @@ type TcGlobals(
897893
let v_query_source_info = makeIntrinsicValRef(fslib_MFLinq_nleref, "Source" , Some "QueryBuilder" , None , [vara], ([[mkQueryBuilderTy];[mkSeqTy varaTy ]], mkQuerySourceTy varaTy (mkNonGenericTy v_tcref_System_Collections_IEnumerable)) )
898894
let v_query_source_as_enum_info = makeIntrinsicValRef(fslib_MFLinq_nleref, "get_Source" , Some "QuerySource`2" , None , [vara; vare], ([[mkQuerySourceTy varaTy vareTy];[]], mkSeqTy varaTy) )
899895
let v_new_query_source_info = makeIntrinsicValRef(fslib_MFLinq_nleref, ".ctor" , Some "QuerySource`2" , None , [vara; vare], ([[mkSeqTy varaTy]], mkQuerySourceTy varaTy vareTy) )
900-
let v_query_where_value_info = makeIntrinsicValRef(fslib_MFLinq_nleref, "Where" , Some "QueryBuilder" , None , [vara; vare], ([[mkQueryBuilderTy];[mkQuerySourceTy varaTy vareTy;varaTy --> v_bool_ty]], mkQuerySourceTy varaTy vareTy) )
901896
let v_query_zero_value_info = makeIntrinsicValRef(fslib_MFLinq_nleref, "Zero" , Some "QueryBuilder" , None , [vara; vare], ([[mkQueryBuilderTy];[]], mkQuerySourceTy varaTy vareTy) )
902897
let v_fail_init_info = makeIntrinsicValRef(fslib_MFIntrinsicFunctions_nleref, "FailInit" , None , None , [], ([[v_unit_ty]], v_unit_ty))
903898
let v_fail_static_init_info = makeIntrinsicValRef(fslib_MFIntrinsicFunctions_nleref, "FailStaticInit" , None , None , [], ([[v_unit_ty]], v_unit_ty))
@@ -1100,8 +1095,6 @@ type TcGlobals(
11001095

11011096
static member IsInEmbeddableKnownSet name = isInEmbeddableKnownSet name
11021097

1103-
member _.embeddedTypeDefs = embeddedILTypeDefs.Values |> Seq.toList
1104-
11051098
member _.tryRemoveEmbeddedILTypeDefs () = [
11061099
for key in embeddedILTypeDefs.Keys.OrderBy id do
11071100
match (embeddedILTypeDefs.TryRemove(key)) with
@@ -1134,8 +1127,6 @@ type TcGlobals(
11341127

11351128
member _.emitDebugInfoInQuotations = emitDebugInfoInQuotations
11361129

1137-
member _.directoryToResolveRelativePaths = directoryToResolveRelativePaths
1138-
11391130
member _.pathMap = pathMap
11401131

11411132
member _.langVersion = langVersion
@@ -1156,10 +1147,6 @@ type TcGlobals(
11561147

11571148
member _.list_tcr_canon = v_list_tcr_canon
11581149

1159-
member val set_tcr_canon = mk_MFCollections_tcref fslibCcu "Set`1"
1160-
1161-
member val map_tcr_canon = mk_MFCollections_tcref fslibCcu "Map`2"
1162-
11631150
member _.lazy_tcr_canon = lazy_tcr
11641151

11651152
member val refcell_tcr_nice = v_refcell_tcr_nice
@@ -1184,10 +1171,6 @@ type TcGlobals(
11841171

11851172
member _.nativeint_tcr = v_nativeint_tcr
11861173

1187-
member _.unativeint_tcr = v_unativeint_tcr
1188-
1189-
member _.int_tcr = v_int_tcr
1190-
11911174
member _.int32_tcr = v_int32_tcr
11921175

11931176
member _.int16_tcr = v_int16_tcr
@@ -1214,8 +1197,6 @@ type TcGlobals(
12141197

12151198
member _.unit_tcr_canon = v_unit_tcr_canon
12161199

1217-
member _.unit_tcr_nice = v_unit_tcr_nice
1218-
12191200
member _.exn_tcr = v_exn_tcr
12201201

12211202
member _.char_tcr = v_char_tcr
@@ -1266,7 +1247,6 @@ type TcGlobals(
12661247

12671248
member _.MatchFailureException_tcr = v_mfe_tcr
12681249

1269-
member _.tcref_IQueryable = v_tcref_IQueryable
12701250

12711251
member _.tcref_IObservable = v_tcref_IObservable
12721252

@@ -1355,7 +1335,6 @@ type TcGlobals(
13551335
member _.string_ty_ambivalent = v_string_ty_ambivalent
13561336
member _.system_IFormattable_tcref = v_IFormattable_tcref
13571337
member _.system_FormattableString_tcref = v_FormattableString_tcref
1358-
member _.system_FormattableStringFactory_tcref = v_FormattableStringFactory_tcref
13591338
member _.system_IFormattable_ty = v_IFormattable_ty
13601339
member _.system_FormattableString_ty = v_FormattableString_ty
13611340
member _.system_FormattableStringFactory_ty = v_FormattableStringFactory_ty
@@ -1381,10 +1360,7 @@ type TcGlobals(
13811360
member val system_Delegate_ty = mkSysNonGenericTy sys "Delegate"
13821361
member val system_MulticastDelegate_ty = mkSysNonGenericTy sys "MulticastDelegate"
13831362
member val system_Enum_ty = mkSysNonGenericTy sys "Enum"
1384-
member val system_Exception_ty = mkSysNonGenericTy sys "Exception"
1385-
member val system_String_typ = mkSysNonGenericTy sys "String"
13861363
member val system_String_tcref = findSysTyconRef sys "String"
1387-
member val system_Int32_ty = mkSysNonGenericTy sys "Int32"
13881364
member _.system_Type_ty = v_system_Type_ty
13891365
member val system_TypedReference_tcref = tryFindSysTyconRef sys "TypedReference"
13901366
member val system_ArgIterator_tcref = tryFindSysTyconRef sys "ArgIterator"
@@ -1405,22 +1381,18 @@ type TcGlobals(
14051381
member val system_Single_tcref = findSysTyconRef sys "Single"
14061382
member val system_Double_tcref = findSysTyconRef sys "Double"
14071383
member val system_RuntimeTypeHandle_ty = mkSysNonGenericTy sys "RuntimeTypeHandle"
1408-
member _.system_RuntimeMethodHandle_ty = v_system_RuntimeMethodHandle_ty
14091384

14101385
member val system_MarshalByRefObject_tcref = tryFindSysTyconRef sys "MarshalByRefObject"
14111386
member val system_MarshalByRefObject_ty = tryMkSysNonGenericTy sys "MarshalByRefObject"
14121387

14131388
member val system_ExceptionDispatchInfo_ty =
14141389
tryMkSysNonGenericTy ["System"; "Runtime"; "ExceptionServices"] "ExceptionDispatchInfo"
14151390

1416-
member _.system_Reflection_MethodInfo_ty = v_system_Reflection_MethodInfo_ty
14171391
member _.mk_IAsyncStateMachine_ty = mkSysNonGenericTy sysCompilerServices "IAsyncStateMachine"
14181392

1419-
member val system_Array_tcref = v_Array_tcref
14201393
member val system_Object_tcref = findSysTyconRef sys "Object"
14211394
member val system_Value_tcref = findSysTyconRef sys "ValueType"
14221395
member val system_Void_tcref = findSysTyconRef sys "Void"
1423-
member val system_IndexOutOfRangeException_tcref = findSysTyconRef sys "IndexOutOfRangeException"
14241396
member val system_Nullable_tcref = v_nullable_tcr
14251397
member val system_GenericIComparable_tcref = findSysTyconRef sys "IComparable`1"
14261398
member val system_GenericIEquatable_tcref = findSysTyconRef sys "IEquatable`1"
@@ -1438,7 +1410,6 @@ type TcGlobals(
14381410
member val tcref_System_Collections_IEqualityComparer = findSysTyconRef sysCollections "IEqualityComparer"
14391411
member val tcref_System_Collections_Generic_IEqualityComparer = findSysTyconRef sysGenerics "IEqualityComparer`1"
14401412
member val tcref_System_Collections_Generic_Dictionary = findSysTyconRef sysGenerics "Dictionary`2"
1441-
member val tcref_System_Collections_Generic_IDictionary = findSysTyconRef sysGenerics "IDictionary`2"
14421413

14431414
member val tcref_System_IComparable = findSysTyconRef sys "IComparable"
14441415
member val tcref_System_IStructuralComparable = findSysTyconRef sysCollections "IStructuralComparable"
@@ -1447,7 +1418,6 @@ type TcGlobals(
14471418

14481419
member val tcref_LanguagePrimitives = mk_MFCore_tcref fslibCcu "LanguagePrimitives"
14491420

1450-
member val tcref_System_Collections_Generic_List = findSysTyconRef sysGenerics "List`1"
14511421
member val tcref_System_Collections_Generic_IList = findSysTyconRef sysGenerics "IList`1"
14521422
member val tcref_System_Collections_Generic_IReadOnlyList = findSysTyconRef sysGenerics "IReadOnlyList`1"
14531423
member val tcref_System_Collections_Generic_ICollection = findSysTyconRef sysGenerics "ICollection`1"
@@ -1462,7 +1432,6 @@ type TcGlobals(
14621432
// Review: Does this need to be an option type?
14631433
member val System_Runtime_CompilerServices_RuntimeFeature_ty = tryFindSysTyconRef sysCompilerServices "RuntimeFeature" |> Option.map mkNonGenericTy
14641434

1465-
member val iltyp_TypedReference = tryFindSysILTypeRef "System.TypedReference" |> Option.map mkILNonGenericValueTy
14661435
member val iltyp_StreamingContext = tryFindSysILTypeRef tname_StreamingContext |> Option.map mkILNonGenericValueTy
14671436
member val iltyp_SerializationInfo = tryFindSysILTypeRef tname_SerializationInfo |> Option.map mkILNonGenericBoxedTy
14681437
member val iltyp_Missing = findSysILTypeRef tname_Missing |> mkILNonGenericBoxedTy
@@ -1507,7 +1476,6 @@ type TcGlobals(
15071476
member val attrib_OptionalAttribute = tryFindSysAttrib "System.Runtime.InteropServices.OptionalAttribute"
15081477
member val attrib_DefaultParameterValueAttribute = tryFindSysAttrib "System.Runtime.InteropServices.DefaultParameterValueAttribute"
15091478
member val attrib_ThreadStaticAttribute = tryFindSysAttrib "System.ThreadStaticAttribute"
1510-
member val attrib_SpecialNameAttribute = tryFindSysAttrib "System.Runtime.CompilerServices.SpecialNameAttribute"
15111479
member val attrib_VolatileFieldAttribute = mk_MFCore_attrib "VolatileFieldAttribute"
15121480
member val attrib_NoEagerConstraintApplicationAttribute = mk_MFCompilerServices_attrib "NoEagerConstraintApplicationAttribute"
15131481
member val attrib_ContextStaticAttribute = tryFindSysAttrib "System.ContextStaticAttribute"
@@ -1521,7 +1489,6 @@ type TcGlobals(
15211489
member val attrib_CallerLineNumberAttribute = findSysAttrib "System.Runtime.CompilerServices.CallerLineNumberAttribute"
15221490
member val attrib_CallerFilePathAttribute = findSysAttrib "System.Runtime.CompilerServices.CallerFilePathAttribute"
15231491
member val attrib_CallerMemberNameAttribute = findSysAttrib "System.Runtime.CompilerServices.CallerMemberNameAttribute"
1524-
member val attrib_ReferenceAssemblyAttribute = findSysAttrib "System.Runtime.CompilerServices.ReferenceAssemblyAttribute"
15251492
member val attrib_SkipLocalsInitAttribute = findSysAttrib "System.Runtime.CompilerServices.SkipLocalsInitAttribute"
15261493
member val attribs_Unsupported = v_attribs_Unsupported
15271494

@@ -1587,7 +1554,6 @@ type TcGlobals(
15871554
member _.new_decimal_info = v_new_decimal_info
15881555
member _.seq_info = v_seq_info
15891556
member val seq_vref = (ValRefForIntrinsic v_seq_info)
1590-
member val fsharpref_vref = (ValRefForIntrinsic v_refcell_info)
15911557
member val and_vref = (ValRefForIntrinsic v_and_info)
15921558
member val and2_vref = (ValRefForIntrinsic v_and2_info)
15931559
member val addrof_vref = (ValRefForIntrinsic v_addrof_info)
@@ -1645,9 +1611,7 @@ type TcGlobals(
16451611
member _.unchecked_multiply_info = v_unchecked_multiply_info
16461612
member _.unchecked_division_info = v_unchecked_division_info
16471613
member _.unchecked_modulus_info = v_unchecked_modulus_info
1648-
member _.unchecked_unary_plus_info = v_unchecked_unary_plus_info
16491614
member _.unchecked_unary_minus_info = v_unchecked_unary_minus_info
1650-
member _.unchecked_unary_not_info = v_unchecked_unary_not_info
16511615
member _.unchecked_defaultof_info = v_unchecked_defaultof_info
16521616

16531617
member _.checked_addition_info = v_checked_addition_info
@@ -1671,7 +1635,6 @@ type TcGlobals(
16711635
member _.sbyte_operator_info = v_sbyte_operator_info
16721636
member _.int16_operator_info = v_int16_operator_info
16731637
member _.uint16_operator_info = v_uint16_operator_info
1674-
member _.int_operator_info = v_int_operator_info
16751638
member _.int32_operator_info = v_int32_operator_info
16761639
member _.uint32_operator_info = v_uint32_operator_info
16771640
member _.int64_operator_info = v_int64_operator_info
@@ -1713,13 +1676,7 @@ type TcGlobals(
17131676
member _.box_info = v_box_info
17141677
member _.isnull_info = v_isnull_info
17151678
member _.raise_info = v_raise_info
1716-
member _.failwith_info = v_failwith_info
1717-
member _.invalid_arg_info = v_invalid_arg_info
1718-
member _.null_arg_info = v_null_arg_info
1719-
member _.invalid_op_info = v_invalid_op_info
1720-
member _.failwithf_info = v_failwithf_info
17211679
member _.reraise_info = v_reraise_info
1722-
member _.methodhandleof_info = v_methodhandleof_info
17231680
member _.typeof_info = v_typeof_info
17241681
member _.typedefof_info = v_typedefof_info
17251682

@@ -1758,7 +1715,6 @@ type TcGlobals(
17581715
member val seq_append_vref = ValRefForIntrinsic v_seq_append_info
17591716
member val seq_generated_vref = ValRefForIntrinsic v_seq_generated_info
17601717
member val seq_finally_vref = ValRefForIntrinsic v_seq_finally_info
1761-
member val seq_of_functions_vref = ValRefForIntrinsic v_seq_of_functions_info
17621718
member val seq_map_vref = ValRefForIntrinsic v_seq_map_info
17631719
member val seq_empty_vref = ValRefForIntrinsic v_seq_empty_info
17641720
member val new_format_vref = ValRefForIntrinsic v_new_format_info
@@ -1775,7 +1731,6 @@ type TcGlobals(
17751731
member val query_yield_vref = ValRefForIntrinsic v_query_yield_value_info
17761732
member val query_yield_from_vref = ValRefForIntrinsic v_query_yield_from_value_info
17771733
member val query_select_vref = ValRefForIntrinsic v_query_select_value_info
1778-
member val query_where_vref = ValRefForIntrinsic v_query_where_value_info
17791734
member val query_zero_vref = ValRefForIntrinsic v_query_zero_value_info
17801735
member val seq_to_list_vref = ValRefForIntrinsic v_seq_to_list_info
17811736
member val seq_to_array_vref = ValRefForIntrinsic v_seq_to_array_info
@@ -1801,7 +1756,6 @@ type TcGlobals(
18011756
member _.getstring_info = v_getstring_info
18021757
member _.unbox_fast_info = v_unbox_fast_info
18031758
member _.istype_info = v_istype_info
1804-
member _.istype_fast_info = v_istype_fast_info
18051759
member _.lazy_force_info = v_lazy_force_info
18061760
member _.lazy_create_info = v_lazy_create_info
18071761
member _.create_instance_info = v_create_instance_info

0 commit comments

Comments
 (0)