Skip to content

Commit 5585ccd

Browse files
dave-bartolomeodave-bartolomeo
committed
C#: Fix up after merge
1 parent 9b8b364 commit 5585ccd

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedExpr.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ class TranslatedEventAccess extends TranslatedNonConstantExpr {
21472147
override TranslatedElement getChild(int id) { id = 0 and result = this.getLValue() }
21482148

21492149
override predicate hasInstruction(
2150-
Opcode opcode, InstructionTag tag, Type resultType, boolean isLValue
2150+
Opcode opcode, InstructionTag tag, CSharpType resultType
21512151
) {
21522152
none()
21532153
}

‎csharp/ql/test/library-tests/ir/ir/raw_ir.expected‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -484,14 +484,14 @@ events.cs:
484484
# 8| System.Void Events..ctor()
485485
# 8| Block 0
486486
# 8| v0_0(Void) = EnterFunction :
487-
# 8| mu0_1(null) = AliasedDefinition :
488-
# 8| mu0_2(null) = UnmodeledDefinition :
487+
# 8| mu0_1(<unknown>) = AliasedDefinition :
488+
# 8| mu0_2(<unknown>) = UnmodeledDefinition :
489489
# 8| r0_3(glval<Events>) = InitializeThis :
490490
# 10| r0_4(MyDel) = NewObj :
491-
# 10| r0_5(glval<null>) = FunctionAddress[MyDel] :
491+
# 10| r0_5(<funcaddr>) = FunctionAddress[MyDel] :
492492
# 10| r0_6(glval<MyDel>) = FunctionAddress[Fun] :
493493
# 10| v0_7(Void) = Call : func:r0_5, this:r0_4, 0:r0_6
494-
# 10| mu0_8(null) = ^CallSideEffect : ~mu0_2
494+
# 10| mu0_8(<unknown>) = ^CallSideEffect : ~mu0_2
495495
# 10| r0_9(Events) = CopyValue : r0_3
496496
# 10| r0_10(glval<MyDel>) = FieldAddress[Inst] : r0_9
497497
# 10| mu0_11(MyDel) = Store : &:r0_10, r0_4
@@ -502,42 +502,42 @@ events.cs:
502502
# 13| System.Void Events.AddEvent()
503503
# 13| Block 0
504504
# 13| v0_0(Void) = EnterFunction :
505-
# 13| mu0_1(null) = AliasedDefinition :
506-
# 13| mu0_2(null) = UnmodeledDefinition :
505+
# 13| mu0_1(<unknown>) = AliasedDefinition :
506+
# 13| mu0_2(<unknown>) = UnmodeledDefinition :
507507
# 13| r0_3(glval<Events>) = InitializeThis :
508508
# 15| r0_4(Events) = CopyValue : r0_3
509-
# 15| r0_5(glval<null>) = FunctionAddress[add_MyEvent] :
509+
# 15| r0_5(<funcaddr>) = FunctionAddress[add_MyEvent] :
510510
# 15| r0_6(Events) = CopyValue : r0_3
511511
# 15| r0_7(glval<MyDel>) = FieldAddress[Inst] : r0_6
512512
# 15| r0_8(MyDel) = Load : &:r0_7, ~mu0_2
513513
# 15| v0_9(Void) = Call : func:r0_5, this:r0_4, 0:r0_8
514-
# 15| mu0_10(null) = ^CallSideEffect : ~mu0_2
514+
# 15| mu0_10(<unknown>) = ^CallSideEffect : ~mu0_2
515515
# 13| v0_11(Void) = ReturnVoid :
516516
# 13| v0_12(Void) = UnmodeledUse : mu*
517517
# 13| v0_13(Void) = ExitFunction :
518518

519519
# 18| System.Void Events.RemoveEvent()
520520
# 18| Block 0
521521
# 18| v0_0(Void) = EnterFunction :
522-
# 18| mu0_1(null) = AliasedDefinition :
523-
# 18| mu0_2(null) = UnmodeledDefinition :
522+
# 18| mu0_1(<unknown>) = AliasedDefinition :
523+
# 18| mu0_2(<unknown>) = UnmodeledDefinition :
524524
# 18| r0_3(glval<Events>) = InitializeThis :
525525
# 20| r0_4(Events) = CopyValue : r0_3
526-
# 20| r0_5(glval<null>) = FunctionAddress[remove_MyEvent] :
526+
# 20| r0_5(<funcaddr>) = FunctionAddress[remove_MyEvent] :
527527
# 20| r0_6(Events) = CopyValue : r0_3
528528
# 20| r0_7(glval<MyDel>) = FieldAddress[Inst] : r0_6
529529
# 20| r0_8(MyDel) = Load : &:r0_7, ~mu0_2
530530
# 20| v0_9(Void) = Call : func:r0_5, this:r0_4, 0:r0_8
531-
# 20| mu0_10(null) = ^CallSideEffect : ~mu0_2
531+
# 20| mu0_10(<unknown>) = ^CallSideEffect : ~mu0_2
532532
# 18| v0_11(Void) = ReturnVoid :
533533
# 18| v0_12(Void) = UnmodeledUse : mu*
534534
# 18| v0_13(Void) = ExitFunction :
535535

536536
# 23| System.String Events.Fun(System.String)
537537
# 23| Block 0
538538
# 23| v0_0(Void) = EnterFunction :
539-
# 23| mu0_1(null) = AliasedDefinition :
540-
# 23| mu0_2(null) = UnmodeledDefinition :
539+
# 23| mu0_1(<unknown>) = AliasedDefinition :
540+
# 23| mu0_2(<unknown>) = UnmodeledDefinition :
541541
# 23| r0_3(glval<Events>) = InitializeThis :
542542
# 23| r0_4(glval<String>) = VariableAddress[str] :
543543
# 23| mu0_5(String) = InitializeParameter[str] : &:r0_4
@@ -553,34 +553,34 @@ events.cs:
553553
# 28| System.Void Events.Main(System.String[])
554554
# 28| Block 0
555555
# 28| v0_0(Void) = EnterFunction :
556-
# 28| mu0_1(null) = AliasedDefinition :
557-
# 28| mu0_2(null) = UnmodeledDefinition :
556+
# 28| mu0_1(<unknown>) = AliasedDefinition :
557+
# 28| mu0_2(<unknown>) = UnmodeledDefinition :
558558
# 28| r0_3(glval<String[]>) = VariableAddress[args] :
559559
# 28| mu0_4(String[]) = InitializeParameter[args] : &:r0_3
560560
# 30| r0_5(glval<Events>) = VariableAddress[obj] :
561561
# 30| r0_6(Events) = NewObj :
562-
# 30| r0_7(glval<null>) = FunctionAddress[Events] :
562+
# 30| r0_7(<funcaddr>) = FunctionAddress[Events] :
563563
# 30| v0_8(Void) = Call : func:r0_7, this:r0_6
564-
# 30| mu0_9(null) = ^CallSideEffect : ~mu0_2
564+
# 30| mu0_9(<unknown>) = ^CallSideEffect : ~mu0_2
565565
# 30| mu0_10(Events) = Store : &:r0_5, r0_6
566566
# 31| r0_11(glval<Events>) = VariableAddress[obj] :
567567
# 31| r0_12(Events) = Load : &:r0_11, ~mu0_2
568-
# 31| r0_13(glval<null>) = FunctionAddress[AddEvent] :
568+
# 31| r0_13(<funcaddr>) = FunctionAddress[AddEvent] :
569569
# 31| v0_14(Void) = Call : func:r0_13, this:r0_12
570-
# 31| mu0_15(null) = ^CallSideEffect : ~mu0_2
570+
# 31| mu0_15(<unknown>) = ^CallSideEffect : ~mu0_2
571571
# 32| r0_16(glval<String>) = VariableAddress[result] :
572572
# 32| r0_17(glval<Events>) = VariableAddress[obj] :
573573
# 32| r0_18(Events) = Load : &:r0_17, ~mu0_2
574-
# 32| r0_19(glval<null>) = FunctionAddress[Invoke] :
574+
# 32| r0_19(<funcaddr>) = FunctionAddress[Invoke] :
575575
# 32| r0_20(String) = StringConstant["string"] :
576576
# 32| v0_21(Void) = Call : func:r0_19, this:r0_18, 0:r0_20
577-
# 32| mu0_22(null) = ^CallSideEffect : ~mu0_2
577+
# 32| mu0_22(<unknown>) = ^CallSideEffect : ~mu0_2
578578
# 32| mu0_23(String) = Store : &:r0_16, v0_21
579579
# 33| r0_24(glval<Events>) = VariableAddress[obj] :
580580
# 33| r0_25(Events) = Load : &:r0_24, ~mu0_2
581-
# 33| r0_26(glval<null>) = FunctionAddress[RemoveEvent] :
581+
# 33| r0_26(<funcaddr>) = FunctionAddress[RemoveEvent] :
582582
# 33| v0_27(Void) = Call : func:r0_26, this:r0_25
583-
# 33| mu0_28(null) = ^CallSideEffect : ~mu0_2
583+
# 33| mu0_28(<unknown>) = ^CallSideEffect : ~mu0_2
584584
# 28| v0_29(Void) = ReturnVoid :
585585
# 28| v0_30(Void) = UnmodeledUse : mu*
586586
# 28| v0_31(Void) = ExitFunction :
@@ -707,8 +707,8 @@ indexers.cs:
707707
# 5| System.Void Indexers.MyClass..ctor()
708708
# 5| Block 0
709709
# 5| v0_0(Void) = EnterFunction :
710-
# 5| mu0_1(null) = AliasedDefinition :
711-
# 5| mu0_2(null) = UnmodeledDefinition :
710+
# 5| mu0_1(<unknown>) = AliasedDefinition :
711+
# 5| mu0_2(<unknown>) = UnmodeledDefinition :
712712
# 5| r0_3(glval<MyClass>) = InitializeThis :
713713
# 6| v0_4(Void) = NoOp :
714714
# 5| v0_5(Void) = ReturnVoid :
@@ -718,8 +718,8 @@ indexers.cs:
718718
# 12| System.String Indexers.MyClass.get_Item(System.Int32)
719719
# 12| Block 0
720720
# 12| v0_0(Void) = EnterFunction :
721-
# 12| mu0_1(null) = AliasedDefinition :
722-
# 12| mu0_2(null) = UnmodeledDefinition :
721+
# 12| mu0_1(<unknown>) = AliasedDefinition :
722+
# 12| mu0_2(<unknown>) = UnmodeledDefinition :
723723
# 12| r0_3(glval<MyClass>) = InitializeThis :
724724
# 10| r0_4(glval<Int32>) = VariableAddress[index] :
725725
# 10| mu0_5(Int32) = InitializeParameter[index] : &:r0_4
@@ -740,8 +740,8 @@ indexers.cs:
740740
# 16| System.Void Indexers.MyClass.set_Item(System.Int32,System.String)
741741
# 16| Block 0
742742
# 16| v0_0(Void) = EnterFunction :
743-
# 16| mu0_1(null) = AliasedDefinition :
744-
# 16| mu0_2(null) = UnmodeledDefinition :
743+
# 16| mu0_1(<unknown>) = AliasedDefinition :
744+
# 16| mu0_2(<unknown>) = UnmodeledDefinition :
745745
# 16| r0_3(glval<MyClass>) = InitializeThis :
746746
# 10| r0_4(glval<Int32>) = VariableAddress[index] :
747747
# 10| mu0_5(Int32) = InitializeParameter[index] : &:r0_4
@@ -763,40 +763,40 @@ indexers.cs:
763763
# 23| System.Void Indexers.Main()
764764
# 23| Block 0
765765
# 23| v0_0(Void) = EnterFunction :
766-
# 23| mu0_1(null) = AliasedDefinition :
767-
# 23| mu0_2(null) = UnmodeledDefinition :
766+
# 23| mu0_1(<unknown>) = AliasedDefinition :
767+
# 23| mu0_2(<unknown>) = UnmodeledDefinition :
768768
# 25| r0_3(glval<MyClass>) = VariableAddress[inst] :
769769
# 25| r0_4(MyClass) = NewObj :
770-
# 25| r0_5(glval<null>) = FunctionAddress[MyClass] :
770+
# 25| r0_5(<funcaddr>) = FunctionAddress[MyClass] :
771771
# 25| v0_6(Void) = Call : func:r0_5, this:r0_4
772-
# 25| mu0_7(null) = ^CallSideEffect : ~mu0_2
772+
# 25| mu0_7(<unknown>) = ^CallSideEffect : ~mu0_2
773773
# 25| mu0_8(MyClass) = Store : &:r0_3, r0_4
774774
# 26| r0_9(glval<MyClass>) = VariableAddress[inst] :
775775
# 26| r0_10(MyClass) = Load : &:r0_9, ~mu0_2
776-
# 26| r0_11(glval<null>) = FunctionAddress[set_Item] :
776+
# 26| r0_11(<funcaddr>) = FunctionAddress[set_Item] :
777777
# 26| r0_12(Int32) = Constant[0] :
778778
# 26| r0_13(String) = StringConstant["str1"] :
779779
# 26| v0_14(Void) = Call : func:r0_11, this:r0_10, 0:r0_12, 1:r0_13
780-
# 26| mu0_15(null) = ^CallSideEffect : ~mu0_2
780+
# 26| mu0_15(<unknown>) = ^CallSideEffect : ~mu0_2
781781
# 27| r0_16(glval<MyClass>) = VariableAddress[inst] :
782782
# 27| r0_17(MyClass) = Load : &:r0_16, ~mu0_2
783-
# 27| r0_18(glval<null>) = FunctionAddress[set_Item] :
783+
# 27| r0_18(<funcaddr>) = FunctionAddress[set_Item] :
784784
# 27| r0_19(Int32) = Constant[1] :
785785
# 27| r0_20(String) = StringConstant["str1"] :
786786
# 27| v0_21(Void) = Call : func:r0_18, this:r0_17, 0:r0_19, 1:r0_20
787-
# 27| mu0_22(null) = ^CallSideEffect : ~mu0_2
787+
# 27| mu0_22(<unknown>) = ^CallSideEffect : ~mu0_2
788788
# 28| r0_23(glval<MyClass>) = VariableAddress[inst] :
789789
# 28| r0_24(MyClass) = Load : &:r0_23, ~mu0_2
790-
# 28| r0_25(glval<null>) = FunctionAddress[set_Item] :
790+
# 28| r0_25(<funcaddr>) = FunctionAddress[set_Item] :
791791
# 28| r0_26(Int32) = Constant[1] :
792792
# 28| r0_27(glval<MyClass>) = VariableAddress[inst] :
793793
# 28| r0_28(MyClass) = Load : &:r0_27, ~mu0_2
794-
# 28| r0_29(glval<null>) = FunctionAddress[get_Item] :
794+
# 28| r0_29(<funcaddr>) = FunctionAddress[get_Item] :
795795
# 28| r0_30(Int32) = Constant[0] :
796796
# 28| r0_31(String) = Call : func:r0_29, this:r0_28, 0:r0_30
797-
# 28| mu0_32(null) = ^CallSideEffect : ~mu0_2
797+
# 28| mu0_32(<unknown>) = ^CallSideEffect : ~mu0_2
798798
# 28| v0_33(Void) = Call : func:r0_25, this:r0_24, 0:r0_26, 1:r0_31
799-
# 28| mu0_34(null) = ^CallSideEffect : ~mu0_2
799+
# 28| mu0_34(<unknown>) = ^CallSideEffect : ~mu0_2
800800
# 23| v0_35(Void) = ReturnVoid :
801801
# 23| v0_36(Void) = UnmodeledUse : mu*
802802
# 23| v0_37(Void) = ExitFunction :

0 commit comments

Comments
 (0)