Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 7f8c3b7

Browse files
TIHannosami
TIHan
authored and
nosami
committed
Remove inline IL parsing method call (dotnet#7947)
* Remove inline IL parsing method call * Remove now dead code * Fixing tests * Trying to fix tests * Trying to fix tests * Trying to fix tests * Update ExprTests.fs
1 parent 0fa7464 commit 7f8c3b7

File tree

8 files changed

+5
-87
lines changed

8 files changed

+5
-87
lines changed

‎src/absil/ilascii.fs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,6 @@ let DoubleInstrs : Lazy<InstrTable<DoubleInstr>> =
226226
["ldc";"r8"], (fun x -> (AI_ldc (DT_R8, x)))
227227
]
228228

229-
/// Table of parsing and pretty printing data for instructions.
230-
let MethodSpecInstrs : Lazy<InstrTable<MethodSpecInstr>> =
231-
lazy [
232-
["call"], (fun (mspec, y) -> I_call (Normalcall, mspec, y))
233-
]
234-
235229
/// Table of parsing and pretty printing data for instructions.
236230
let StringInstrs : Lazy<InstrTable<StringInstr>> =
237231
lazy [

‎src/absil/ilascii.fsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ val Int64Instrs: LazyInstrTable<Int64Instr>
4141
val Int32Instrs: LazyInstrTable<Int32Instr>
4242
val Int32Int32Instrs: LazyInstrTable<Int32Int32Instr>
4343
val DoubleInstrs: LazyInstrTable<DoubleInstr>
44-
val MethodSpecInstrs: LazyInstrTable<MethodSpecInstr>
4544
val StringInstrs: LazyInstrTable<StringInstr>
4645
val TokenInstrs: LazyInstrTable<TokenInstr>
4746
val TypeInstrs: LazyInstrTable<TypeInstr>

‎src/absil/illex.fsl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ let kwdInstrTable =
7070
addTable (fun i -> INSTR_I32_I32 i) Int32Int32Instrs;
7171
addTable (fun i -> INSTR_I8 i) Int64Instrs;
7272
addTable (fun i -> INSTR_R i) DoubleInstrs;
73-
addTable (fun i -> INSTR_METHOD i) MethodSpecInstrs;
7473
addTable (fun i -> INSTR_TYPE i) TypeInstrs;
7574
addTable (fun i -> INSTR_INT_TYPE i) IntTypeInstrs;
7675
addTable (fun i -> INSTR_VALUETYPE i) ValueTypeInstrs;

‎src/absil/ilpars.fsy

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@ let pfailwith s =
2020
stderr.WriteLine ("*** error: "+s);
2121
raise Parsing.RecoverableParseError
2222

23-
/// vararg sentinels
24-
type SigArg = SigArg of (string option * ILType) | Sentinel
25-
26-
let decodeVarargs args =
27-
let rec normals = function
28-
| [] -> ([],None)
29-
| Sentinel :: t -> ([],Some (varargs t))
30-
| SigArg (_,p) :: t -> let (n,r) = normals t in (p :: n, r)
31-
and varargs = function
32-
| [] -> []
33-
| SigArg (_,ty) :: t -> let l = varargs t in ty :: l
34-
| Sentinel :: t -> pfailwith "two sentinels in vararg call"
35-
normals args
36-
37-
3823
type ResolvedAtMethodSpecScope<'T> =
3924
ResolvedAtMethodSpecScope of (ILGenericParameterDefs -> 'T)
4025

@@ -43,11 +28,6 @@ let resolveMethodSpecScope (ResolvedAtMethodSpecScope f) x = f x
4328
let resolveMethodSpecScopeThen (ResolvedAtMethodSpecScope f) g =
4429
ResolvedAtMethodSpecScope (fun x -> resolveMethodSpecScope (g(f x)) x)
4530

46-
let resolveFormalMethodSpecScope tspeco obj =
47-
match tspeco with
48-
None -> resolveMethodSpecScope obj mkILEmptyGenericParams
49-
| Some (tspec:ILTypeSpec) -> resolveMethodSpecScope obj (mkILFormalTypars tspec.GenericArgs)
50-
5131
let resolveCurrentMethodSpecScope obj =
5232
resolveMethodSpecScope obj mkILEmptyGenericParams
5333

@@ -75,7 +55,6 @@ let findAssemblyRef nm =
7555
%token <Int32Int32Instr> INSTR_I32_I32
7656
%token <Int64Instr> INSTR_I8
7757
%token <DoubleInstr> INSTR_R
78-
%token <MethodSpecInstr> INSTR_METHOD
7958
%token <NoArgInstr> INSTR_NONE
8059
%token <StringInstr> INSTR_STRING
8160
%token <TokenInstr> INSTR_TOK
@@ -163,18 +142,6 @@ instrs2:
163142
{ $1 :: $2 }
164143
| { [] }
165144

166-
167-
168-
methodSpecMaybeArrayMethod:
169-
callConv typ typSpec DCOLON methodName opt_actual_tyargs LPAREN sigArgs0 RPAREN
170-
{ let callee_class_typ : ILType = resolveCurrentMethodSpecScope $3
171-
let gscope = (if isILArrTy callee_class_typ then None else Some callee_class_typ.TypeSpec)
172-
let argtys_n_varargs = resolveFormalMethodSpecScope gscope $8
173-
let (argtys,varargs) = decodeVarargs argtys_n_varargs
174-
let minst = resolveCurrentMethodSpecScope $6
175-
let callee_retty = resolveFormalMethodSpecScope gscope $2
176-
(callee_class_typ, $1, $5, argtys, callee_retty, minst), varargs }
177-
178145
instr:
179146
INSTR_NONE
180147
{ ($1 ()) }
@@ -188,19 +155,6 @@ instr:
188155
{ ($1 (ILConst.R8 $2)) }
189156
| INSTR_R int64
190157
{ ($1 (ILConst.R8 (float $2))) }
191-
| INSTR_METHOD methodSpecMaybeArrayMethod
192-
{
193-
let ((encl_typ, _cc, nm, _argtys, _retty, _minst) as data),varargs = $2
194-
if isILArrTy encl_typ then
195-
let (shape,ty) = destILArrTy encl_typ
196-
match nm with
197-
| "Get" -> I_ldelem_any(shape,ty)
198-
| "Set" -> I_stelem_any(shape,ty)
199-
| "Address" -> I_ldelema(NormalAddress,false,shape,ty)
200-
| ".ctor" -> I_newarr(shape,ty)
201-
| _ -> failwith "bad method on array type"
202-
else
203-
$1 (mkILMethSpecInTy data, varargs) }
204158
| INSTR_TYPE typSpec
205159
{ $1 (resolveCurrentMethodSpecScope $2) }
206160
| INSTR_INT_TYPE int32 typSpec
@@ -209,34 +163,6 @@ instr:
209163
{ $1 (resolveCurrentMethodSpecScope $2) }
210164
| INSTR_TOK typSpec
211165
{ ($1 (ILToken.ILType (resolveCurrentMethodSpecScope $2))) }
212-
213-
/*-----------------------------------------------
214-
* Formal signatures of methods etc.
215-
*---------------------------------------------*/
216-
217-
sigArgs0:
218-
{ noMethodSpecScope [] }
219-
| sigArgs1 { $1 }
220-
221-
sigArgs1:
222-
sigArgs1a
223-
{ ResolvedAtMethodSpecScope (fun c -> List.map (fun obj -> resolveMethodSpecScope obj c) (List.rev $1)) }
224-
225-
sigArgs1a:
226-
sigArg
227-
{ [$1] }
228-
| sigArgs1a COMMA sigArg
229-
{ $3 :: $1 }
230-
231-
sigArg:
232-
| typ opt_id
233-
{ resolveMethodSpecScopeThen $1 (fun ty ->
234-
noMethodSpecScope (SigArg($2, ty))) }
235-
236-
237-
238-
opt_id: { None } | id { Some $1 }
239-
240166

241167
/*-----------------------------------------------
242168
* Type names

‎src/fsharp/FSharp.Core/prim-types.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,11 +1663,10 @@ namespace Microsoft.FSharp.Core
16631663
let GenericHashWithComparerIntrinsic<'T> (comp : System.Collections.IEqualityComparer) (input : 'T) : int =
16641664
GenericHashParamObj comp (box input)
16651665

1666-
/// Direct call to GetHashCode on the string type
16671666
let inline HashString (s:string) =
16681667
match s with
16691668
| null -> 0
1670-
| _ -> (# "call instance int32 [mscorlib]System.String :: GetHashCode()" s : int #)
1669+
| _ -> s.GetHashCode()
16711670

16721671
// from mscorlib v4.0.30319
16731672
let inline HashChar (x:char) = (# "or" (# "shl" x 16 : int #) x : int #)

‎tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
IL_0006: ldc.i4 0x483
7575
IL_000b: ldc.i4.s 99
7676
IL_000d: ldstr "5"
77-
IL_0012: call instance int32 [mscorlib]System.String::GetHashCode()
77+
IL_0012: callvirt instance int32 [mscorlib]System.Object::GetHashCode()
7878
IL_0017: xor
7979
IL_0018: xor
8080
IL_0019: stloc.0

‎tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
IL_0006: ldc.i4 0x483
7575
IL_000b: ldc.i4.s 99
7676
IL_000d: ldstr "5"
77-
IL_0012: call instance int32 [mscorlib]System.String::GetHashCode()
77+
IL_0012: callvirt instance int32 [mscorlib]System.Object::GetHashCode()
7878
IL_0017: xor
7979
IL_0018: xor
8080
IL_0019: stloc.0

‎tests/service/ExprTests.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ let ``Test Unoptimized Declarations Project1`` () =
784784
//#if NETCOREAPP2_0
785785
//[<Ignore("SKIPPED: need to check if these tests can be enabled for .NET Core testing of FSharp.Compiler.Service")>]
786786
//#endif
787+
[<Ignore("SKIPPED: FSharp.Core nuget package needs to be updated before this test can be re-enabled")>]
787788
let ``Test Optimized Declarations Project1`` () =
788789
let wholeProjectResults = exprChecker.ParseAndCheckProject(Project1.options) |> Async.RunSynchronously
789790

@@ -903,7 +904,7 @@ let ``Test Optimized Declarations Project1`` () =
903904
"let testHashUInt64(x) = Operators.op_ExclusiveOr<Microsoft.FSharp.Core.int> (Operators.ToInt32<Microsoft.FSharp.Core.uint64> (x),Operators.ToInt32<Microsoft.FSharp.Core.int> (Operators.op_RightShift<Microsoft.FSharp.Core.uint64> (x,32))) @ (12,32--12,38)";
904905
"let testHashIntPtr(x) = Operators.ToInt32<Microsoft.FSharp.Core.uint64> (Operators.ToUInt64<Microsoft.FSharp.Core.nativeint> (x)) @ (13,35--13,41)";
905906
"let testHashUIntPtr(x) = Operators.op_BitwiseAnd<Microsoft.FSharp.Core.int> (Operators.ToInt32<Microsoft.FSharp.Core.uint64> (Operators.ToUInt64<Microsoft.FSharp.Core.unativeint> (x)),2147483647) @ (14,37--14,43)";
906-
"let testHashString(x) = (if Operators.op_Equality<Microsoft.FSharp.Core.string> (x,dflt) then 0 else Operators.Hash<Microsoft.FSharp.Core.string> (x)) @ (16,32--16,38)";
907+
"let testHashString(x) = (if Operators.op_Equality<Microsoft.FSharp.Core.string> (x,dflt) then 0 else x.GetHashCode()) @ (16,32--16,38)";
907908
"let testTypeOf(x) = Operators.TypeOf<'T> () @ (17,24--17,30)";
908909
"let mutableVar(x) = (if Operators.op_GreaterThan<Microsoft.FSharp.Core.int> (x,0) then let mutable acc: Microsoft.FSharp.Core.int = x in acc <- x else ()) @ (20,4--22,16)";
909910
"let mutableConst(unitVar0) = let mutable acc: Microsoft.FSharp.Core.unit = () in acc <- () @ (25,16--25,19)";

0 commit comments

Comments
 (0)