$ { // Code size 27 (0x1b) .maxstack 2 @@ -5677,6 +5718,7 @@ .maxstack 2 IL_0019: stloc.2 IL_001a: ret } + <

$>b__0_0 { // Code size 13 (0xd) .maxstack 8 @@ -5685,6 +5727,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5697,6 +5740,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -5705,6 +5749,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + <

$>b__0#1 { // Code size 7 (0x7) .maxstack 8 @@ -5793,6 +5838,7 @@ public void F() g.VerifyIL( """ + F { // Code size 31 (0x1f) .maxstack 8 @@ -5806,6 +5852,7 @@ .maxstack 8 IL_0019: stsfld 0x04000004 IL_001e: ret } + b__1_0 { // Code size 13 (0xd) .maxstack 8 @@ -5814,6 +5861,7 @@ .maxstack 8 IL_0007: newobj 0x06000008 IL_000c: throw } + b__1_1 { // Code size 8 (0x8) .maxstack 8 @@ -5822,6 +5870,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__1_0#1 { // Code size 13 (0xd) .maxstack 8 @@ -5831,6 +5880,7 @@ .maxstack 8 IL_000b: nop IL_000c: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5922,6 +5972,7 @@ public void F() g.VerifyIL( """ + F { // Code size 4 (0x4) .maxstack 8 @@ -5930,6 +5981,7 @@ .maxstack 8 IL_0002: nop IL_0003: ret } + g__L1|1_0 { // Code size 13 (0xd) .maxstack 8 @@ -5938,6 +5990,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + g__L2|1_1 { // Code size 8 (0x8) .maxstack 8 @@ -5946,6 +5999,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L1|1_0#1 { // Code size 13 (0xd) .maxstack 8 @@ -5955,6 +6009,7 @@ .maxstack 8 IL_000b: nop IL_000c: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6021,6 +6076,7 @@ public void F() g.VerifyIL( """ + F { // Code size 31 (0x1f) .maxstack 8 @@ -6034,6 +6090,7 @@ .maxstack 8 IL_0019: stsfld 0x04000003 IL_001e: ret } + b__1_0 { // Code size 13 (0xd) .maxstack 8 @@ -6042,6 +6099,7 @@ .maxstack 8 IL_0007: newobj 0x06000008 IL_000c: throw } + b__1_1 { // Code size 8 (0x8) .maxstack 8 @@ -6050,6 +6108,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__1_0#1 { // Code size 13 (0xd) .maxstack 8 @@ -6059,6 +6118,7 @@ .maxstack 8 IL_000b: nop IL_000c: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6122,6 +6182,7 @@ public void F() g.VerifyIL( """ + F { // Code size 4 (0x4) .maxstack 8 @@ -6130,6 +6191,7 @@ .maxstack 8 IL_0002: nop IL_0003: ret } + g__L1|1_0 { // Code size 13 (0xd) .maxstack 8 @@ -6138,6 +6200,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + g__L2|1_1 { // Code size 8 (0x8) .maxstack 8 @@ -6146,6 +6209,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L1|1_0#1 { // Code size 13 (0xd) .maxstack 8 @@ -6155,6 +6219,7 @@ .maxstack 8 IL_000b: nop IL_000c: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6257,6 +6322,7 @@ public void F() g.VerifyIL( """ + F { // Code size 35 (0x23) .maxstack 2 @@ -6275,6 +6341,7 @@ .maxstack 2 IL_0021: nop IL_0022: ret } + b__0 { // Code size 7 (0x7) .maxstack 8 @@ -6356,6 +6423,7 @@ public void F() g.VerifyIL( """ + F { // Code size 13 (0xd) .maxstack 2 @@ -6368,6 +6436,7 @@ .maxstack 2 IL_000b: nop IL_000c: ret } + g__L|0_0 { // Code size 7 (0x7) .maxstack 8 @@ -6427,6 +6496,7 @@ public void F() g.VerifyIL( """ + F { // Code size 32 (0x20) .maxstack 2 @@ -6441,6 +6511,7 @@ .maxstack 2 IL_001a: stsfld 0x04000004 IL_001f: ret } + b__0 { // Code size 13 (0xd) .maxstack 8 @@ -6449,6 +6520,7 @@ .maxstack 8 IL_0007: newobj 0x06000005 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6461,6 +6533,7 @@ .maxstack 8 IL_000a: stfld 0x04000002 IL_000f: ret } + .cctor { // Code size 11 (0xb) .maxstack 8 @@ -6468,6 +6541,7 @@ .maxstack 8 IL_0005: stsfld 0x04000003 IL_000a: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -6476,6 +6550,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0_0#1 { // Code size 8 (0x8) .maxstack 8 @@ -6518,6 +6593,7 @@ public void F() g.VerifyIL( """ + F { // Code size 16 (0x10) .maxstack 2 @@ -6530,6 +6606,7 @@ .maxstack 2 IL_000e: nop IL_000f: ret } + b__0_0#1 { // Code size 12 (0xc) .maxstack 8 @@ -6538,6 +6615,7 @@ .maxstack 8 IL_0006: newobj 0x06000005 IL_000b: throw } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -6546,6 +6624,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0#2 { // Code size 15 (0xf) .maxstack 8 @@ -6643,6 +6722,7 @@ public void F() g.VerifyIL( """ + F { // Code size 14 (0xe) .maxstack 1 @@ -6661,6 +6741,7 @@ .maxstack 1 IL_000c: nop IL_000d: ret } + g__L|0_0 { // Code size 13 (0xd) .maxstack 8 @@ -6669,6 +6750,7 @@ .maxstack 8 IL_0007: newobj 0x06000007 IL_000c: throw } + g__L|0_1 { // Code size 12 (0xc) .maxstack 8 @@ -6677,6 +6759,7 @@ .maxstack 8 IL_0006: newobj 0x06000007 IL_000b: throw } + g__L|0_0#1 { // Code size 8 (0x8) .maxstack 8 @@ -6685,6 +6768,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L|0_1#1 { // Code size 8 (0x8) .maxstack 8 @@ -6693,6 +6777,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6807,6 +6892,7 @@ public void F() g.VerifyIL( """ + F { // Code size 58 (0x3a) .maxstack 8 @@ -6825,6 +6911,7 @@ .maxstack 8 IL_0034: stsfld 0x04000003 IL_0039: ret } + b__1_0 { // Code size 13 (0xd) .maxstack 8 @@ -6833,6 +6920,7 @@ .maxstack 8 IL_0007: newobj 0x06000007 IL_000c: throw } + b__1_1 { // Code size 8 (0x8) .maxstack 8 @@ -6841,6 +6929,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6853,6 +6942,7 @@ .maxstack 8 IL_000a: stfld 0x04000004 IL_000f: ret } + b__1_0#1 { // Code size 8 (0x8) .maxstack 8 @@ -6959,6 +7049,7 @@ public void F() g.VerifyIL( """ + F { // Code size 4 (0x4) .maxstack 8 @@ -6967,6 +7058,7 @@ .maxstack 8 IL_0002: nop IL_0003: ret } + g__L1|1_0 { // Code size 13 (0xd) .maxstack 8 @@ -6975,6 +7067,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + g__L2|1_1 { // Code size 8 (0x8) .maxstack 8 @@ -6983,6 +7076,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L1|1_0#1 { // Code size 8 (0x8) .maxstack 8 @@ -6991,6 +7085,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7056,6 +7151,7 @@ public void F() g.VerifyIL( """ + F { // Code size 16 (0x10) .maxstack 2 @@ -7068,6 +7164,7 @@ .maxstack 2 IL_000e: nop IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -7076,6 +7173,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0#1 { // Code size 13 (0xd) .maxstack 8 @@ -7116,6 +7214,7 @@ public void F() g.VerifyMethodDefNames("F", "b__0#1", ".ctor"); g.VerifyIL(""" + F { // Code size 4 (0x4) .maxstack 1 @@ -7124,6 +7223,7 @@ .maxstack 1 IL_0002: stloc.2 IL_0003: ret } + b__0#1 { // Code size 12 (0xc) .maxstack 8 @@ -7132,6 +7232,7 @@ .maxstack 8 IL_0006: newobj 0x06000005 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7195,6 +7296,7 @@ public void F() g.VerifyIL( """ + F { // Code size 11 (0xb) .maxstack 2 @@ -7205,6 +7307,7 @@ .maxstack 2 IL_0009: nop IL_000a: ret } + g__L|0#1_0#1 { // Code size 13 (0xd) .maxstack 8 @@ -7242,6 +7345,7 @@ public void F() g.VerifyMethodDefNames("F", "g__L|0#1_0#1", ".ctor"); g.VerifyIL(""" + F { // Code size 4 (0x4) .maxstack 1 @@ -7250,6 +7354,7 @@ .maxstack 1 IL_0002: stloc.2 IL_0003: ret } + g__L|0#1_0#1 { // Code size 12 (0xc) .maxstack 8 @@ -7258,6 +7363,7 @@ .maxstack 8 IL_0006: newobj 0x06000004 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7360,6 +7466,7 @@ void F() g.VerifyIL( """ + F { // Code size 82 (0x52) .maxstack 3 @@ -7396,6 +7503,7 @@ .maxstack 3 IL_0050: nop IL_0051: ret } + b__0 { // Code size 7 (0x7) .maxstack 8 @@ -7403,6 +7511,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + b__1 { // Code size 12 (0xc) .maxstack 8 @@ -7411,6 +7520,7 @@ .maxstack 8 IL_0006: newobj 0x06000008 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7423,6 +7533,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -7431,6 +7542,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__1#1 { // Code size 19 (0x13) .maxstack 8 @@ -7552,6 +7664,7 @@ void F() g.VerifyIL( """ + F { // Code size 24 (0x18) .maxstack 2 @@ -7570,6 +7683,7 @@ .maxstack 2 IL_0016: nop IL_0017: ret } + g__L1|0_0 { // Code size 7 (0x7) .maxstack 8 @@ -7577,6 +7691,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + g__L2|0_1 { // Code size 12 (0xc) .maxstack 8 @@ -7585,6 +7700,7 @@ .maxstack 8 IL_0006: newobj 0x06000006 IL_000b: throw } + g__L2|0_1#1 { // Code size 14 (0xe) .maxstack 8 @@ -7595,6 +7711,7 @@ .maxstack 8 IL_000c: add IL_000d: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7698,6 +7815,7 @@ void F() g.VerifyIL( """ + F { // Code size 68 (0x44) .maxstack 2 @@ -7728,6 +7846,7 @@ .maxstack 2 IL_0042: nop IL_0043: ret } + b__0 { // Code size 7 (0x7) .maxstack 8 @@ -7735,6 +7854,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + b__1 { // Code size 12 (0xc) .maxstack 8 @@ -7743,6 +7863,7 @@ .maxstack 8 IL_0006: newobj 0x06000008 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -7755,6 +7876,7 @@ .maxstack 8 IL_000a: stfld 0x04000004 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -7763,6 +7885,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__1#1 { // Code size 7 (0x7) .maxstack 8 @@ -7883,6 +8006,7 @@ void F() g.VerifyIL( """ + F { // Code size 24 (0x18) .maxstack 2 @@ -7901,6 +8025,7 @@ .maxstack 2 IL_0016: nop IL_0017: ret } + g__L1|0_0 { // Code size 7 (0x7) .maxstack 8 @@ -7908,6 +8033,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + g__L2|0_1 { // Code size 12 (0xc) .maxstack 8 @@ -7916,6 +8042,7 @@ .maxstack 8 IL_0006: newobj 0x06000006 IL_000b: throw } + g__L2|0_1#1 { // Code size 7 (0x7) .maxstack 8 @@ -7923,6 +8050,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -8019,6 +8147,7 @@ void F() "b__2#1"); g.VerifyIL(""" + F { // Code size 131 (0x83) .maxstack 2 @@ -8069,6 +8198,7 @@ .maxstack 2 IL_0081: nop IL_0082: ret } + b__0 { // Code size 7 (0x7) .maxstack 8 @@ -8076,6 +8206,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + b__1 { // Code size 12 (0xc) .maxstack 8 @@ -8084,6 +8215,7 @@ .maxstack 8 IL_0006: newobj 0x06000008 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -8096,6 +8228,7 @@ .maxstack 8 IL_000a: stfld 0x04000004 IL_000f: ret } + .ctor, .ctor { // Code size 8 (0x8) .maxstack 8 @@ -8104,6 +8237,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__1#1 { // Code size 24 (0x18) .maxstack 8 @@ -8116,6 +8250,7 @@ .maxstack 8 IL_0016: add IL_0017: ret } + b__2#1 { // Code size 36 (0x24) .maxstack 8 @@ -8249,6 +8384,7 @@ void F() g.VerifyMethodDefNames("F", "g__L1|0_0", "g__L2|0_1", "g__L3|0_2#1"); g.VerifyIL(""" + F { // Code size 35 (0x23) .maxstack 2 @@ -8273,6 +8409,7 @@ .maxstack 2 IL_0021: nop IL_0022: ret } + g__L1|0_0 { // Code size 7 (0x7) .maxstack 8 @@ -8280,6 +8417,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + g__L2|0_1 { // Code size 14 (0xe) .maxstack 8 @@ -8290,6 +8428,7 @@ .maxstack 8 IL_000c: add IL_000d: ret } + g__L3|0_2#1 { // Code size 21 (0x15) .maxstack 8 @@ -8427,6 +8566,7 @@ public void F() g.VerifyIL( """ + F { // Code size 84 (0x54) .maxstack 2 @@ -8460,6 +8600,7 @@ .maxstack 2 IL_0052: nop IL_0053: ret } + b__0 { // Code size 7 (0x7) .maxstack 8 @@ -8467,6 +8608,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + b__2 { // Code size 12 (0xc) .maxstack 8 @@ -8475,6 +8617,7 @@ .maxstack 8 IL_0006: newobj 0x06000009 IL_000b: throw } + b__1 { // Code size 7 (0x7) .maxstack 8 @@ -8482,6 +8625,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -8494,6 +8638,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + b__2#1 { // Code size 9 (0x9) .maxstack 8 @@ -8625,6 +8770,7 @@ public void F() g.VerifyIL( """ + F { // Code size 23 (0x17) .maxstack 2 @@ -8642,6 +8788,7 @@ .maxstack 2 IL_0015: nop IL_0016: ret } + g__L1|0_0 { // Code size 7 (0x7) .maxstack 8 @@ -8649,6 +8796,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + g__L2|0_1 { // Code size 7 (0x7) .maxstack 8 @@ -8656,6 +8804,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + g__L3|0_2 { // Code size 12 (0xc) .maxstack 8 @@ -8664,6 +8813,7 @@ .maxstack 8 IL_0006: newobj 0x06000007 IL_000b: throw } + g__L3|0_2#1 { // Code size 9 (0x9) .maxstack 8 @@ -8673,6 +8823,7 @@ .maxstack 8 IL_0007: add IL_0008: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -8789,6 +8940,7 @@ public void F() g.VerifyIL( """ + F { // Code size 62 (0x3e) .maxstack 2 @@ -8816,6 +8968,7 @@ .maxstack 2 IL_003c: nop IL_003d: ret } + g__L1|0 { // Code size 13 (0xd) .maxstack 8 @@ -8824,6 +8977,7 @@ .maxstack 8 IL_0007: newobj 0x0600000A IL_000c: throw } + b__2 { // Code size 12 (0xc) .maxstack 8 @@ -8832,6 +8986,7 @@ .maxstack 8 IL_0006: newobj 0x0600000A IL_000b: throw } + b__1 { // Code size 7 (0x7) .maxstack 8 @@ -8839,6 +8994,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + g__L1|1_0#1 { // Code size 7 (0x7) .maxstack 8 @@ -8846,6 +9002,7 @@ .maxstack 8 IL_0001: ldfld 0x04000004 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -8858,6 +9015,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + b__2#1 { // Code size 9 (0x9) .maxstack 8 @@ -8990,6 +9148,7 @@ public void F() g.VerifyMethodDefNames("F", "g__L1|1_0", "g__L3|1_2", "b__1", ".ctor", "g__L3|2#1"); g.VerifyIL(""" + F { // Code size 45 (0x2d) .maxstack 2 @@ -9013,6 +9172,7 @@ .maxstack 2 IL_002b: nop IL_002c: ret } + g__L1|1_0 { // Code size 7 (0x7) .maxstack 8 @@ -9020,6 +9180,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + g__L3|1_2 { // Code size 12 (0xc) .maxstack 8 @@ -9028,6 +9189,7 @@ .maxstack 8 IL_0006: newobj 0x06000008 IL_000b: throw } + b__1 { // Code size 7 (0x7) .maxstack 8 @@ -9035,6 +9197,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9047,6 +9210,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + g__L3|2#1 { // Code size 9 (0x9) .maxstack 8 @@ -9128,6 +9292,7 @@ public void F() g.VerifyIL( """ + F { // Code size 40 (0x28) .maxstack 2 @@ -9147,6 +9312,7 @@ .maxstack 2 IL_0026: nop IL_0027: ret } + b__0 { // Code size 14 (0xe) .maxstack 8 @@ -9224,6 +9390,7 @@ public void F() g.VerifyMethodDefNames("F", "g__L|0_0", "g__L|0_0#1", ".ctor"); g.VerifyIL(""" + F { // Code size 19 (0x13) .maxstack 2 @@ -9237,6 +9404,7 @@ .maxstack 2 IL_0011: nop IL_0012: ret } + g__L|0_0 { // Code size 13 (0xd) .maxstack 8 @@ -9245,6 +9413,7 @@ .maxstack 8 IL_0007: newobj 0x06000005 IL_000c: throw } + g__L|0_0#1 { // Code size 14 (0xe) .maxstack 8 @@ -9255,6 +9424,7 @@ .maxstack 8 IL_000c: add IL_000d: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9342,6 +9512,7 @@ public void F() g.VerifyIL( """ + F { // Code size 40 (0x28) .maxstack 2 @@ -9361,6 +9532,7 @@ .maxstack 2 IL_0026: nop IL_0027: ret } + b__0 { // Code size 14 (0xe) .maxstack 8 @@ -9442,6 +9614,7 @@ public void F() g.VerifyIL( """ + F { // Code size 11 (0xb) .maxstack 2 @@ -9452,6 +9625,7 @@ .maxstack 2 IL_0009: nop IL_000a: ret } + g__L|0 { // Code size 13 (0xd) .maxstack 8 @@ -9460,6 +9634,7 @@ .maxstack 8 IL_0007: newobj 0x06000008 IL_000c: throw } + b__1 { // Code size 12 (0xc) .maxstack 8 @@ -9468,6 +9643,7 @@ .maxstack 8 IL_0006: newobj 0x06000008 IL_000b: throw } + g__L|1_0#1 { // Code size 7 (0x7) .maxstack 8 @@ -9475,6 +9651,7 @@ .maxstack 8 IL_0001: ldfld 0x04000003 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9573,6 +9750,7 @@ public void F() g.VerifyIL( """ + F { // Code size 11 (0xb) .maxstack 2 @@ -9583,6 +9761,7 @@ .maxstack 2 IL_0009: nop IL_000a: ret } + g__L|0 { // Code size 13 (0xd) .maxstack 8 @@ -9591,6 +9770,7 @@ .maxstack 8 IL_0007: newobj 0x06000007 IL_000c: throw } + g__L|1_0#1 { // Code size 7 (0x7) .maxstack 8 @@ -9598,6 +9778,7 @@ .maxstack 8 IL_0001: ldfld 0x04000003 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9676,6 +9857,7 @@ public void F() g.VerifyMethodDefNames("F", "g__L|1_0", ".ctor", ".ctor", "g__L|0#1", "b__1#1"); g.VerifyIL(""" + F { // Code size 34 (0x22) .maxstack 2 @@ -9693,6 +9875,7 @@ .maxstack 2 IL_0020: nop IL_0021: ret } + g__L|1_0 { // Code size 13 (0xd) .maxstack 8 @@ -9701,6 +9884,7 @@ .maxstack 8 IL_0007: newobj 0x06000005 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9713,6 +9897,7 @@ .maxstack 8 IL_000a: stfld 0x04000002 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -9721,6 +9906,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L|0#1, b__1#1 { // Code size 7 (0x7) .maxstack 8 @@ -9794,7 +9980,8 @@ public void F() g.VerifyIL( """ - { + F + { // Code size 34 (0x22) .maxstack 2 IL_0000: newobj 0x06000006 @@ -9811,6 +9998,7 @@ .maxstack 2 IL_0020: nop IL_0021: ret } + g__L|1_0 { // Code size 13 (0xd) .maxstack 8 @@ -9819,6 +10007,7 @@ .maxstack 8 IL_0007: newobj 0x06000005 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9831,6 +10020,7 @@ .maxstack 8 IL_000a: stfld 0x04000002 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -9839,6 +10029,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__L|0#1 { // Code size 7 (0x7) .maxstack 8 @@ -9906,6 +10097,7 @@ public void F() g.VerifyIL( """ + F { // Code size 30 (0x1e) .maxstack 8 @@ -9918,6 +10110,7 @@ .maxstack 8 IL_0018: stsfld 0x04000004 IL_001d: ret } + b__0_0 { // Code size 16 (0x10) .maxstack 8 @@ -9926,6 +10119,7 @@ .maxstack 8 IL_000a: newobj 0x06000006 IL_000f: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -9938,6 +10132,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } + b__0_0#1 { // Code size 10 (0xa) .maxstack 8 diff --git a/src/roslyn/src/Compilers/CSharp/Test/Emit2/Emit/EditAndContinue/EditAndContinueTests.cs b/src/roslyn/src/Compilers/CSharp/Test/Emit2/Emit/EditAndContinue/EditAndContinueTests.cs index cadd2d351b7..52fb9f8a639 100644 --- a/src/roslyn/src/Compilers/CSharp/Test/Emit2/Emit/EditAndContinue/EditAndContinueTests.cs +++ b/src/roslyn/src/Compilers/CSharp/Test/Emit2/Emit/EditAndContinue/EditAndContinueTests.cs @@ -11,6 +11,8 @@ using System.Linq; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; +using System.Text; +using System.Threading; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; @@ -100,7 +102,8 @@ public C() Handle(4, TableIndex.CustomAttribute) }); - var expectedIL = """ + g.VerifyIL(""" + .ctor { // Code size 13 (0xd) .maxstack 8 @@ -109,6 +112,7 @@ .maxstack 8 IL_0007: newobj 0x06000003 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -121,10 +125,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -186,6 +187,7 @@ class C }); g.VerifyIL(""" + .ctor { // Code size 13 (0xd) .maxstack 8 @@ -194,6 +196,7 @@ .maxstack 8 IL_0007: newobj 0x06000003 IL_000c: throw } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -202,6 +205,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -2324,6 +2328,7 @@ void F() }); g.VerifyIL(""" + F { // Code size 30 (0x1e) .maxstack 8 @@ -2336,6 +2341,7 @@ .maxstack 8 IL_0018: stsfld 0x04000003 IL_001d: ret } + b__0_0 { // Code size 12 (0xc) .maxstack 8 @@ -2344,6 +2350,7 @@ .maxstack 8 IL_0006: newobj 0x06000007 IL_000b: throw } + b__0_1 { // Code size 8 (0x8) .maxstack 8 @@ -2352,6 +2359,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -2664,6 +2672,7 @@ partial void M() g.VerifyMethodDefNames("M", "b__0", ".ctor", ".ctor", "b__0#1"); g.VerifyIL(""" + M { // Code size 28 (0x1c) .maxstack 2 @@ -2679,6 +2688,7 @@ .maxstack 2 IL_001a: stloc.1 IL_001b: ret } + b__0 { // Code size 12 (0xc) .maxstack 8 @@ -2687,6 +2697,7 @@ .maxstack 8 IL_0006: newobj 0x06000005 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -2699,6 +2710,7 @@ .maxstack 8 IL_000a: stfld 0x04000002 IL_000f: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -2707,6 +2719,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0#1 { // Code size 9 (0x9) .maxstack 8 @@ -3991,6 +4004,7 @@ class C }) .AddGeneration( + // 1 source: """ class C { @@ -4031,6 +4045,7 @@ class C }); g.VerifyIL(""" + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -4039,6 +4054,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -4054,6 +4070,7 @@ .maxstack 8 """); }) .AddGeneration( + // 2 source: """ class C { @@ -4090,7 +4107,8 @@ class C Handle(4, TableIndex.MethodSemantics), }); - var expectedIL = """ + g.VerifyIL(""" + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4098,6 +4116,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4106,10 +4125,7 @@ .maxstack 8 IL_0002: stfld 0x04000001 IL_0007: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -4133,6 +4149,7 @@ class C }) .AddGeneration( + // 1 source: """ class C { @@ -4175,6 +4192,7 @@ class C ]); g.VerifyIL(""" + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -4183,6 +4201,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -4198,6 +4217,7 @@ .maxstack 8 """); }) .AddGeneration( + // 2 source: """ class C { @@ -4243,7 +4263,8 @@ class C Handle(4, TableIndex.MethodSemantics) ]); - var expectedIL = """ + g.VerifyIL(""" + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4251,6 +4272,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4259,10 +4281,7 @@ .maxstack 8 IL_0002: stfld 0x04000002 IL_0007: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -4324,6 +4343,7 @@ class C }); g.VerifyIL(""" + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -4332,6 +4352,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -4386,6 +4407,7 @@ class C }); g.VerifyIL(""" + get_P { // Code size 11 (0xb) .maxstack 1 @@ -4396,6 +4418,7 @@ .maxstack 1 IL_0009: ldloc.0 IL_000a: ret } + set_P { // Code size 2 (0x2) .maxstack 8 @@ -4460,6 +4483,7 @@ class C }); g.VerifyIL(""" + set_P { // Code size 13 (0xd) .maxstack 8 @@ -4468,6 +4492,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -4521,6 +4546,7 @@ class C }); g.VerifyIL(""" + get_P { // Code size 11 (0xb) .maxstack 1 @@ -4531,6 +4557,7 @@ .maxstack 1 IL_0009: ldloc.0 IL_000a: ret } + set_P { // Code size 2 (0x2) .maxstack 8 @@ -4607,6 +4634,7 @@ class C ]); var expectedIL = """ + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4614,6 +4642,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4692,6 +4721,7 @@ class C ]); var expectedIL = """ + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4699,6 +4729,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4772,6 +4803,7 @@ class C ]); var expectedIL = """ + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4779,6 +4811,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4881,7 +4914,8 @@ class C Handle(4, TableIndex.MethodSemantics) }); - var expectedIL = """ + g.VerifyIL(""" + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -4890,6 +4924,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4897,6 +4932,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4905,6 +4941,7 @@ .maxstack 8 IL_0002: stfld 0x04000002 IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -4917,10 +4954,7 @@ .maxstack 8 IL_000a: stfld 0x04000003 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .AddGeneration( // 2 @@ -4972,6 +5006,7 @@ class C }); g.VerifyIL(""" + get_P { // Code size 7 (0x7) .maxstack 8 @@ -4979,6 +5014,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -4987,6 +5023,7 @@ .maxstack 8 IL_0002: stfld 0x04000001 IL_0007: ret } + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -5087,6 +5124,7 @@ class C }); g.VerifyIL(""" + get_P, set_P { // Code size 13 (0xd) .maxstack 8 @@ -5095,6 +5133,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + get_Q { // Code size 7 (0x7) .maxstack 8 @@ -5102,6 +5141,7 @@ .maxstack 8 IL_0001: ldfld 0x04000002 IL_0006: ret } + set_Q { // Code size 8 (0x8) .maxstack 8 @@ -5110,6 +5150,7 @@ .maxstack 8 IL_0002: stfld 0x04000002 IL_0007: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5174,6 +5215,7 @@ class C }); g.VerifyIL(""" + get_P { // Code size 7 (0x7) .maxstack 8 @@ -5181,6 +5223,7 @@ .maxstack 8 IL_0001: ldfld 0x04000001 IL_0006: ret } + set_P { // Code size 8 (0x8) .maxstack 8 @@ -5189,6 +5232,7 @@ .maxstack 8 IL_0002: stfld 0x04000001 IL_0007: ret } + get_Q, set_Q { // Code size 13 (0xd) .maxstack 8 @@ -5260,6 +5304,7 @@ class C }); g.VerifyIL(""" + get_Item, set_Item { // Code size 13 (0xd) .maxstack 8 @@ -5268,6 +5313,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5354,7 +5400,8 @@ class C }); g.VerifyIL(""" - { + get_Item + { // Code size 13 (0xd) .maxstack 8 IL_0000: ldstr 0x70000005 @@ -5362,6 +5409,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + get_Item { // Code size 7 (0x7) .maxstack 1 @@ -5372,6 +5420,7 @@ .maxstack 1 IL_0005: ldloc.0 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5426,6 +5475,7 @@ class C }); g.VerifyIL(""" + get_Item { // Code size 7 (0x7) .maxstack 1 @@ -5436,6 +5486,7 @@ .maxstack 1 IL_0005: ldloc.0 IL_0006: ret } + get_Item { // Code size 13 (0xd) .maxstack 8 @@ -5485,6 +5536,7 @@ class C }); g.VerifyIL(""" + get_Item { // Code size 7 (0x7) .maxstack 1 @@ -5553,12 +5605,14 @@ class C }); g.VerifyIL(""" + get_Item { // Code size 2 (0x2) .maxstack 8 IL_0000: ldc.i4.1 IL_0001: ret } + set_Item { // Code size 2 (0x2) .maxstack 8 @@ -5767,6 +5821,7 @@ class C }); g.VerifyIL(""" + add_E, remove_E { // Code size 13 (0xd) .maxstack 8 @@ -5775,6 +5830,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -5883,6 +5939,7 @@ class C }); g.VerifyIL(""" + add_E, remove_E { // Code size 13 (0xd) .maxstack 8 @@ -5891,6 +5948,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + add_F { // Code size 41 (0x29) .maxstack 3 @@ -5915,6 +5973,7 @@ .maxstack 3 IL_0026: bne.un.s IL_0007 IL_0028: ret } + remove_F { // Code size 41 (0x29) .maxstack 3 @@ -5939,6 +5998,7 @@ .maxstack 3 IL_0026: bne.un.s IL_0007 IL_0028: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -6006,6 +6066,7 @@ class C }); g.VerifyIL(""" + add_E { // Code size 41 (0x29) .maxstack 3 @@ -6030,6 +6091,7 @@ .maxstack 3 IL_0026: bne.un.s IL_0007 IL_0028: ret } + remove_E { // Code size 41 (0x29) .maxstack 3 @@ -6054,6 +6116,7 @@ .maxstack 3 IL_0026: bne.un.s IL_0007 IL_0028: ret } + add_F, remove_F { // Code size 13 (0xd) .maxstack 8 @@ -12190,7 +12253,8 @@ class C Handle(4, TableIndex.CustomAttribute) ]); - var expectedIL = """ + g.VerifyIL(""" + op_LogicalNot { // Code size 13 (0xd) .maxstack 8 @@ -12199,6 +12263,7 @@ .maxstack 8 IL_0007: newobj 0x06000003 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -12211,10 +12276,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -12447,8 +12509,9 @@ static string F() badStream, ilStream, pdbStream, + EmitDifferenceOptions.Default, new CompilationTestData(), - default); + CancellationToken.None); Assert.False(result.Success); result.Diagnostics.Verify( // error CS8104: An error occurred while writing the output file: System.IO.IOException: I/O error occurred. @@ -12462,8 +12525,9 @@ static string F() mdStream, badStream, pdbStream, + EmitDifferenceOptions.Default, new CompilationTestData(), - default); + CancellationToken.None); Assert.False(result.Success); result.Diagnostics.Verify( // error CS8104: An error occurred while writing the output file: System.IO.IOException: I/O error occurred. @@ -12477,8 +12541,9 @@ static string F() mdStream, ilStream, badStream, + EmitDifferenceOptions.Default, new CompilationTestData(), - default); + CancellationToken.None); Assert.False(result.Success); result.Diagnostics.Verify( // error CS0041: Unexpected error writing debug information -- 'I/O error occurred.' @@ -12532,8 +12597,9 @@ static string F() mdStream, ilStream, badStream, + EmitDifferenceOptions.Default, new CompilationTestData(), - default); + CancellationToken.None); Assert.False(result.Success); result.Diagnostics.Verify( // error CS0041: Unexpected error writing debug information -- 'I/O error occurred.' @@ -15990,6 +16056,7 @@ public void Records_AddPrimaryConstructorParameter() }); g.VerifyIL(""" + .ctor { // Code size 29 (0x1d) .maxstack 8 @@ -16007,6 +16074,7 @@ .maxstack 8 IL_001b: nop IL_001c: ret } + get_Q { // Code size 7 (0x7) .maxstack 8 @@ -16014,6 +16082,7 @@ .maxstack 8 IL_0001: ldfld 0x04000005 IL_0006: ret } + set_Q { // Code size 8 (0x8) .maxstack 8 @@ -16022,6 +16091,7 @@ .maxstack 8 IL_0002: stfld 0x04000005 IL_0007: ret } + Deconstruct { // Code size 25 (0x19) .maxstack 8 @@ -16108,6 +16178,7 @@ public void Records_AddProperty_NonPrimary() }); g.VerifyIL(""" + get_Q { // Code size 7 (0x7) .maxstack 8 @@ -16115,6 +16186,7 @@ .maxstack 8 IL_0001: ldfld 0x04000004 IL_0006: ret } + set_Q { // Code size 8 (0x8) .maxstack 8 @@ -16351,7 +16423,8 @@ class C g.VerifyTypeRefNames("Object"); g.VerifyIL(""" - { + F + { // Code size 13 (0xd) .maxstack 8 IL_0000: ldstr 0x70000005 @@ -16359,6 +16432,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -16417,6 +16491,7 @@ void F2() {} g.VerifyTypeRefNames("Object"); g.VerifyIL(""" + F1 { // Code size 13 (0xd) .maxstack 8 @@ -16445,6 +16520,7 @@ class C g.VerifyTypeRefNames("Object"); g.VerifyIL(""" + F2 { // Code size 13 (0xd) .maxstack 8 @@ -16500,6 +16576,7 @@ void F2() {} g.VerifyTypeRefNames("Exception", "Object"); g.VerifyIL(""" + F1 { // Code size 13 (0xd) .maxstack 8 @@ -16508,6 +16585,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 10 (0xa) .maxstack 8 @@ -16538,6 +16616,7 @@ class C g.VerifyTypeRefNames("Object"); g.VerifyIL(""" + F2 { // Code size 13 (0xd) .maxstack 8 @@ -16594,6 +16673,84 @@ void F2() {} .Verify(); } + [Fact] + public void Method_Delete_PredefinedHotReloadException_DataSectionLiterals() + { + var parseOptions = TestOptions.Regular.WithFeature("experimental-data-section-string-literals", "0"); + + var exceptionSource = """ + namespace System.Runtime.CompilerServices + { + public class HotReloadException : Exception + { + public HotReloadException(string message, int code) : base(message) {} + } + } + """; + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.FailsPEVerify, parseOptions: parseOptions) + .AddBaseline( + source: exceptionSource + """ + class C + { + void F1() {} + void F2() {} + } + """) + .AddGeneration( + // 1 + source: exceptionSource + """ + class C + { + void F2() {} + } + """, + edits: + [ + Edit(SemanticEditKind.Delete, symbolProvider: c => c.GetMember("C.F1"), newSymbolProvider: c => c.GetMember("C")), + ], + validator: g => + { + g.VerifySynthesizedMembers(); + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=163", "A70F5C822D3106BF474269B4991AB592"); + g.VerifyTypeRefNames("Object", "CompilerGeneratedAttribute", "ValueType", "Encoding"); + + g.VerifyIL(""" + F1 + { + // Code size 13 (0xd) + .maxstack 8 + IL_0000: ldsfld 0x04000002 + IL_0005: ldc.i4.s -2 + IL_0007: newobj 0x06000004 + IL_000c: throw + } + BytesToString + { + // Code size 13 (0xd) + .maxstack 8 + IL_0000: call 0x0A000008 + IL_0005: ldarg.0 + IL_0006: ldarg.1 + IL_0007: callvirt 0x0A000009 + IL_000c: ret + } + .cctor + { + // Code size 21 (0x15) + .maxstack 8 + IL_0000: ldsflda 0x04000001 + IL_0005: ldc.i4 0xa3 + IL_000a: call 0x06000005 + IL_000f: stsfld 0x04000002 + IL_0014: ret + } + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + [Theory] [InlineData("void M1() { }")] [InlineData("void M1(string s) { }")] @@ -16665,7 +16822,8 @@ class N Handle(4, TableIndex.CustomAttribute) ]); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 13 (0xd) .maxstack 8 @@ -16674,6 +16832,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -16686,10 +16845,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -16737,17 +16893,15 @@ void M2() { } Handle(3, TableIndex.MethodDef), }); - var expectedIL = """ + g.VerifyIL(""" + M2 { // Code size 2 (0x2) .maxstack 8 IL_0000: nop IL_0001: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .AddGeneration( @@ -16784,7 +16938,8 @@ void M1() { } Handle(4, TableIndex.CustomAttribute) }); - var expectedIL = """ + g.VerifyIL(""" + M2 { // Code size 13 (0xd) .maxstack 8 @@ -16793,6 +16948,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -16805,10 +16961,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -16863,7 +17016,8 @@ class C Handle(4, TableIndex.CustomAttribute) }); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 13 (0xd) .maxstack 8 @@ -16872,6 +17026,7 @@ .maxstack 8 IL_0007: newobj 0x06000003 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -16884,10 +17039,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .AddGeneration( @@ -16914,6 +17066,7 @@ class C }); g.VerifyIL(""" + M1 { // Code size 9 (0x9) .maxstack 8 @@ -16992,8 +17145,9 @@ class C new CustomAttributeRow(Handle(5, TableIndex.TypeDef), Handle(6, TableIndex.MemberRef)) ]); - var expectedIL = """ - { + g.VerifyIL(""" + M1 + { // Code size 13 (0xd) .maxstack 8 IL_0000: ldstr 0x70000005 @@ -17001,6 +17155,7 @@ .maxstack 8 IL_0007: newobj 0x06000005 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -17013,10 +17168,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .AddGeneration( @@ -17064,17 +17216,15 @@ void M1([B]int x) { } new CustomAttributeRow(Handle(3, TableIndex.MethodDef), Handle(2, TableIndex.MethodDef)) }); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 2 (0x2) .maxstack 8 IL_0000: nop IL_0001: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -17128,7 +17278,8 @@ void Goo() { } Handle(1, TableIndex.StandAloneSig) }); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 7 (0x7) .maxstack 1 @@ -17139,10 +17290,7 @@ .maxstack 1 IL_0005: ldloc.0 IL_0006: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .AddGeneration( @@ -17181,7 +17329,8 @@ void Goo() { } Handle(4, TableIndex.CustomAttribute) }); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 13 (0xd) .maxstack 8 @@ -17190,6 +17339,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -17202,10 +17352,7 @@ .maxstack 8 IL_000a: stfld 0x04000001 IL_000f: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) @@ -17238,7 +17385,8 @@ void Goo() { } Handle(2, TableIndex.StandAloneSig) }); - var expectedIL = """ + g.VerifyIL(""" + M1 { // Code size 14 (0xe) .maxstack 1 @@ -17252,10 +17400,7 @@ .maxstack 1 IL_000c: ldloc.0 IL_000d: ret } - """; - - // Can't verify the IL of individual methods because that requires IMethodSymbolInternal implementations - g.VerifyIL(expectedIL); + """); }) .Verify(); } @@ -17324,6 +17469,7 @@ class C }); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -17332,6 +17478,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + b__0_0 { // Code size 12 (0xc) .maxstack 8 @@ -17340,6 +17487,7 @@ .maxstack 8 IL_0006: newobj 0x06000006 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -17398,6 +17546,7 @@ class C }); g.VerifyIL(""" + F { // Code size 30 (0x1e) .maxstack 8 @@ -17410,6 +17559,7 @@ .maxstack 8 IL_0018: stsfld 0x04000004 IL_001d: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -17418,6 +17568,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0#2_0#2 { // Code size 8 (0x8) .maxstack 8 @@ -17467,6 +17618,7 @@ class C }); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -17475,6 +17627,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + b__0#2_0#2 { // Code size 12 (0xc) .maxstack 8 @@ -17576,7 +17729,8 @@ class C }); g.VerifyIL(""" - { + F + { // Code size 13 (0xd) .maxstack 8 IL_0000: ldstr 0x70000009 @@ -17584,6 +17738,7 @@ .maxstack 8 IL_0007: newobj 0x06000006 IL_000c: throw } + b__0#1_0#1 { // Code size 12 (0xc) .maxstack 8 @@ -17592,6 +17747,7 @@ .maxstack 8 IL_0006: newobj 0x06000006 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -17754,6 +17910,7 @@ class C }); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -17762,6 +17919,7 @@ .maxstack 8 IL_0007: newobj 0x0600000C IL_000c: throw } + b__0_0, b__0_1#1, b__0_2#2 { // Code size 12 (0xc) .maxstack 8 @@ -17770,6 +17928,7 @@ .maxstack 8 IL_0006: newobj 0x0600000C IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -17816,6 +17975,7 @@ void F<[A]S>([A]T a, S b) where S : struct g.VerifyMemberRefNames(".ctor", "<>9__0#4_0#4", "<>9", "b__0#4_0#4", ".ctor", ".ctor", "<>9", ".ctor", "WriteLine"); g.VerifyIL(""" + F { // Code size 30 (0x1e) .maxstack 8 @@ -17828,6 +17988,7 @@ .maxstack 8 IL_0018: stsfld 0x0A000026 IL_001d: ret } + .cctor { // Code size 11 (0xb) .maxstack 8 @@ -17835,6 +17996,7 @@ .maxstack 8 IL_0005: stsfld 0x0A00002B IL_000a: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -17843,6 +18005,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + b__0#4_0#4 { // Code size 8 (0x8) .maxstack 8 @@ -17896,6 +18059,7 @@ class C }); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -17904,6 +18068,7 @@ .maxstack 8 IL_0007: newobj 0x0600000C IL_000c: throw } + b__0#4_0#4 { // Code size 12 (0xc) .maxstack 8 @@ -18029,6 +18194,7 @@ class C }); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -18037,6 +18203,7 @@ .maxstack 8 IL_0007: newobj 0x06000009 IL_000c: throw } + g__L|0_0, g__M|0_1#1 { // Code size 12 (0xc) .maxstack 8 @@ -18045,6 +18212,7 @@ .maxstack 8 IL_0006: newobj 0x06000009 IL_000b: throw } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -18096,6 +18264,7 @@ ref readonly T O(ref readonly T b) g.VerifyMemberRefNames(".ctor", ".ctor", "x", "g__O|0#3", ".ctor", "g__N|0#3_1#3"); g.VerifyIL(""" + F { // Code size 29 (0x1d) .maxstack 2 @@ -18113,12 +18282,14 @@ .maxstack 2 IL_001b: pop IL_001c: ret } + g__N|0#3_1#3 { // Code size 2 (0x2) .maxstack 8 IL_0000: ldarg.0 IL_0001: ret } + .ctor { // Code size 8 (0x8) .maxstack 8 @@ -18127,6 +18298,7 @@ .maxstack 8 IL_0006: nop IL_0007: ret } + g__O|0#3 { // Code size 9 (0x9) .maxstack 1 @@ -18139,6 +18311,7 @@ .maxstack 1 IL_0007: ldloc.0 IL_0008: ret } + b__2#3 { // Code size 12 (0xc) .maxstack 8 @@ -18187,6 +18360,7 @@ class C ]); g.VerifyIL(""" + F { // Code size 13 (0xd) .maxstack 8 @@ -18195,6 +18369,7 @@ .maxstack 8 IL_0007: newobj 0x06000009 IL_000c: throw } + g__N|0#3_1#3, g__O|0#3, b__2#3 { // Code size 12 (0xc) .maxstack 8 @@ -18334,6 +18509,7 @@ class C }); g.VerifyIL(""" + M { // Code size 13 (0xd) .maxstack 8 @@ -18342,6 +18518,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + M { // Code size 10 (0xa) .maxstack 8 @@ -18351,6 +18528,7 @@ .maxstack 8 IL_0008: pop IL_0009: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -18398,6 +18576,7 @@ class C }); g.VerifyIL(""" + M { // Code size 10 (0xa) .maxstack 8 @@ -18407,6 +18586,7 @@ .maxstack 8 IL_0008: pop IL_0009: ret } + M { // Code size 13 (0xd) .maxstack 8 @@ -18483,6 +18663,7 @@ class C }); g.VerifyIL(""" + M { // Code size 13 (0xd) .maxstack 8 @@ -18491,6 +18672,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + M { // Code size 7 (0x7) .maxstack 1 @@ -18501,6 +18683,7 @@ .maxstack 1 IL_0005: ldloc.0 IL_0006: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -18549,6 +18732,7 @@ class C }); g.VerifyIL(""" + M { // Code size 13 (0xd) .maxstack 1 @@ -18560,6 +18744,7 @@ .maxstack 1 IL_000b: ldloc.0 IL_000c: ret } + M { // Code size 13 (0xd) .maxstack 8 @@ -18637,6 +18822,7 @@ class C }); g.VerifyIL(""" + M { // Code size 13 (0xd) .maxstack 8 @@ -18645,6 +18831,7 @@ .maxstack 8 IL_0007: newobj 0x06000004 IL_000c: throw } + M { // Code size 10 (0xa) .maxstack 8 @@ -18654,6 +18841,7 @@ .maxstack 8 IL_0008: pop IL_0009: ret } + .ctor { // Code size 16 (0x10) .maxstack 8 @@ -18700,6 +18888,7 @@ class C }); g.VerifyIL(""" + M { // Code size 10 (0xa) .maxstack 8 @@ -18709,6 +18898,7 @@ .maxstack 8 IL_0008: pop IL_0009: ret } + M { // Code size 13 (0xd) .maxstack 8 @@ -19129,7 +19319,7 @@ .locals init (System.Span V_0, //x [Fact] [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] - public void PrivateImplDetails_DataFields_Arrays() + public void PrivateImplDetails_DataFields_Arrays_FieldRvaNotSupported() { using var _ = new EditAndContinueTest() .AddBaseline( @@ -19233,7 +19423,95 @@ .maxstack 5 [Fact] [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] - public void PrivateImplDetails_DataFields_StackAlloc() + public void PrivateImplDetails_DataFields_Arrays_FieldRvaSupported() + { + using var _ = new EditAndContinueTest() + .AddBaseline( + source: $$""" + class C + { + byte[] b = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=10"); + g.VerifyFieldDefNames("b", "1F825AA2F0020EF7CF91DFA30DA4668D791C5D4824FC8E41354B89EC05795AB3"); + g.VerifyMethodDefNames(".ctor"); + }) + + .AddGeneration( + source: """ + class C + { + byte[] b = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + } + """, + edits: new[] + { + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetParameterlessConstructor("C")), + }, + validator: g => + { + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=11"); + g.VerifyFieldDefNames("78A6273103D17C39A0B6126E226CEC70E33337F4BC6A38067401B54A33E78EAD"); + g.VerifyMethodDefNames(".ctor"); + + g.VerifyEncLogDefinitions(new[] + { + Row(5, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(6, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(3, TableIndex.Field, EditAndContinueOperation.Default), + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(2, TableIndex.ClassLayout, EditAndContinueOperation.Default), + Row(2, TableIndex.FieldRva, EditAndContinueOperation.Default), + Row(2, TableIndex.NestedClass, EditAndContinueOperation.Default) + }); + + g.VerifyEncMapDefinitions(new[] + { + Handle(5, TableIndex.TypeDef), + Handle(6, TableIndex.TypeDef), + Handle(3, TableIndex.Field), + Handle(1, TableIndex.MethodDef), + Handle(5, TableIndex.CustomAttribute), + Handle(2, TableIndex.ClassLayout), + Handle(2, TableIndex.FieldRva), + Handle(2, TableIndex.NestedClass) + }); + + g.VerifyIL("C..ctor", """ + { + // Code size 32 (0x20) + .maxstack 4 + IL_0000: ldarg.0 + IL_0001: ldc.i4.s 11 + IL_0003: newarr "byte" + IL_0008: dup + IL_0009: ldtoken "#1.__StaticArrayInitTypeSize=11 #1.78A6273103D17C39A0B6126E226CEC70E33337F4BC6A38067401B54A33E78EAD" + IL_000e: call "void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)" + IL_0013: stfld "byte[] C.b" + IL_0018: ldarg.0 + IL_0019: call "object..ctor()" + IL_001e: nop + IL_001f: ret + } + """); + + // trailing zeros for alignment: + g.VerifyEncFieldRvaData(""" + 78A6273103D17C39A0B6126E226CEC70E33337F4BC6A38067401B54A33E78EAD: 00-01-02-03-04-05-06-07-08-09-0A-00-00 + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataFields_StackAlloc_FieldRvaNotSupported() { using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net80, verification: Verification.Skipped) .AddBaseline( @@ -19342,20 +19620,20 @@ .locals init (System.ReadOnlySpan V_0, //b [Fact] [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] - public void PrivateImplDetails_DataFields_Utf8() + public void PrivateImplDetails_DataFields_StackAlloc_FieldRvaSupported() { using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net80, verification: Verification.Skipped) .AddBaseline( - source: """ + source: $$""" class C { - System.ReadOnlySpan F() => "0123456789"u8; + void F() { System.ReadOnlySpan b = stackalloc byte[] { 0, 1, 2, 3, 4, 5, 6 }; } } """, validator: g => { - g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=11"); - g.VerifyFieldDefNames("BEB0DBD1C6FAC1140DD817514F2FBDF501E246BF16C8E877E71187E9EB008189"); + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=7"); + g.VerifyFieldDefNames("57355AC3303C148F11AEF7CB179456B9232CDE33A818DFDA2C2FCB9325749A6B"); g.VerifyMethodDefNames("F", ".ctor"); }) @@ -19363,7 +19641,7 @@ class C source: """ class C { - System.ReadOnlySpan F() => "0123456789X"u8; + void F() { System.ReadOnlySpan b = stackalloc byte[] { 0, 1, 2, 3, 4, 5, 6, 7 }; } } """, edits: new[] @@ -19372,49 +19650,140 @@ class C }, validator: g => { - g.VerifyTypeDefNames(); - g.VerifyFieldDefNames(); + g.VerifyTypeDefNames("#1"); + g.VerifyFieldDefNames("8A851FF82EE7048AD09EC3847F1DDF44944104D2CBD17EF4E3DB22C6785A0D45"); g.VerifyMethodDefNames("F"); g.VerifyEncLogDefinitions(new[] { - Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default) + Row(2, TableIndex.StandAloneSig, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(2, TableIndex.Field, EditAndContinueOperation.Default), + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(2, TableIndex.FieldRva, EditAndContinueOperation.Default) }); g.VerifyEncMapDefinitions(new[] { - Handle(1, TableIndex.MethodDef) + Handle(5, TableIndex.TypeDef), + Handle(2, TableIndex.Field), + Handle(1, TableIndex.MethodDef), + Handle(5, TableIndex.CustomAttribute), + Handle(2, TableIndex.StandAloneSig), + Handle(2, TableIndex.FieldRva) }); g.VerifyIL("C.F", """ { - // Code size 73 (0x49) + // Code size 32 (0x20) .maxstack 4 - IL_0000: ldc.i4.s 12 - IL_0002: newarr "byte" - IL_0007: dup - IL_0008: ldc.i4.0 - IL_0009: ldc.i4.s 48 - IL_000b: stelem.i1 - IL_000c: dup - IL_000d: ldc.i4.1 - IL_000e: ldc.i4.s 49 - IL_0010: stelem.i1 - IL_0011: dup - IL_0012: ldc.i4.2 - IL_0013: ldc.i4.s 50 - IL_0015: stelem.i1 - IL_0016: dup - IL_0017: ldc.i4.3 - IL_0018: ldc.i4.s 51 - IL_001a: stelem.i1 - IL_001b: dup - IL_001c: ldc.i4.4 - IL_001d: ldc.i4.s 52 - IL_001f: stelem.i1 - IL_0020: dup - IL_0021: ldc.i4.5 - IL_0022: ldc.i4.s 53 + .locals init (System.ReadOnlySpan V_0, //b + System.Span V_1) + IL_0000: nop + IL_0001: ldc.i4.8 + IL_0002: conv.u + IL_0003: localloc + IL_0005: dup + IL_0006: ldsflda "long #1.8A851FF82EE7048AD09EC3847F1DDF44944104D2CBD17EF4E3DB22C6785A0D45" + IL_000b: ldc.i4.8 + IL_000c: unaligned. 1 + IL_000f: cpblk + IL_0011: ldc.i4.8 + IL_0012: newobj "System.Span..ctor(void*, int)" + IL_0017: stloc.1 + IL_0018: ldloc.1 + IL_0019: call "System.ReadOnlySpan System.Span.op_Implicit(System.Span)" + IL_001e: stloc.0 + IL_001f: ret + } + """); + + // trailing zeros for alignment: + g.VerifyEncFieldRvaData(""" + 8A851FF82EE7048AD09EC3847F1DDF44944104D2CBD17EF4E3DB22C6785A0D45: 00-01-02-03-04-05-06-07 + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataFields_Utf8_FieldRvaNotSupported() + { + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net80, verification: Verification.Skipped) + .AddBaseline( + source: """ + class C + { + System.ReadOnlySpan F() => "0123456789"u8; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=11"); + g.VerifyFieldDefNames("BEB0DBD1C6FAC1140DD817514F2FBDF501E246BF16C8E877E71187E9EB008189"); + g.VerifyMethodDefNames("F", ".ctor"); + }) + + .AddGeneration( + source: """ + class C + { + System.ReadOnlySpan F() => "0123456789X"u8; + } + """, + edits: new[] + { + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + }, + validator: g => + { + g.VerifyTypeDefNames(); + g.VerifyFieldDefNames(); + g.VerifyMethodDefNames("F"); + + g.VerifyEncLogDefinitions(new[] + { + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default) + }); + + g.VerifyEncMapDefinitions(new[] + { + Handle(1, TableIndex.MethodDef) + }); + + g.VerifyIL("C.F", """ + { + // Code size 73 (0x49) + .maxstack 4 + IL_0000: ldc.i4.s 12 + IL_0002: newarr "byte" + IL_0007: dup + IL_0008: ldc.i4.0 + IL_0009: ldc.i4.s 48 + IL_000b: stelem.i1 + IL_000c: dup + IL_000d: ldc.i4.1 + IL_000e: ldc.i4.s 49 + IL_0010: stelem.i1 + IL_0011: dup + IL_0012: ldc.i4.2 + IL_0013: ldc.i4.s 50 + IL_0015: stelem.i1 + IL_0016: dup + IL_0017: ldc.i4.3 + IL_0018: ldc.i4.s 51 + IL_001a: stelem.i1 + IL_001b: dup + IL_001c: ldc.i4.4 + IL_001d: ldc.i4.s 52 + IL_001f: stelem.i1 + IL_0020: dup + IL_0021: ldc.i4.5 + IL_0022: ldc.i4.s 53 IL_0024: stelem.i1 IL_0025: dup IL_0026: ldc.i4.6 @@ -19446,6 +19815,493 @@ .maxstack 4 .Verify(); } + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataFields_Utf8_FieldRvaSupported() + { + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net80, verification: Verification.Skipped) + .AddBaseline( + source: """ + class C + { + System.ReadOnlySpan F() => "0123456789"u8; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=11"); + g.VerifyFieldDefNames("BEB0DBD1C6FAC1140DD817514F2FBDF501E246BF16C8E877E71187E9EB008189"); + g.VerifyMethodDefNames("F", ".ctor"); + }) + + .AddGeneration( + source: """ + class C + { + System.ReadOnlySpan F() => "0123456789X"u8; + } + """, + edits: new[] + { + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + }, + validator: g => + { + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=12"); + g.VerifyFieldDefNames("AFB1C33C5229BFF7EF739BA44DA795A2B68A49E06001C07C5B026CAA6C6322BB"); + g.VerifyMethodDefNames("F"); + + g.VerifyEncLogDefinitions(new[] + { + Row(5, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(6, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(2, TableIndex.Field, EditAndContinueOperation.Default), + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(2, TableIndex.ClassLayout, EditAndContinueOperation.Default), + Row(2, TableIndex.FieldRva, EditAndContinueOperation.Default), + Row(2, TableIndex.NestedClass, EditAndContinueOperation.Default) + }); + + g.VerifyEncMapDefinitions(new[] + { + Handle(5, TableIndex.TypeDef), + Handle(6, TableIndex.TypeDef), + Handle(2, TableIndex.Field), + Handle(1, TableIndex.MethodDef), + Handle(5, TableIndex.CustomAttribute), + Handle(2, TableIndex.ClassLayout), + Handle(2, TableIndex.FieldRva), + Handle(2, TableIndex.NestedClass) + }); + + g.VerifyIL("C.F", """ + { + // Code size 13 (0xd) + .maxstack 2 + IL_0000: ldsflda "#1.__StaticArrayInitTypeSize=12 #1.AFB1C33C5229BFF7EF739BA44DA795A2B68A49E06001C07C5B026CAA6C6322BB" + IL_0005: ldc.i4.s 11 + IL_0007: newobj "System.ReadOnlySpan..ctor(void*, int)" + IL_000c: ret + } + """); + + // trailing zeros for alignment: + g.VerifyEncFieldRvaData($""" + AFB1C33C5229BFF7EF739BA44DA795A2B68A49E06001C07C5B026CAA6C6322BB: {BitConverter.ToString(Encoding.UTF8.GetBytes("0123456789X"))}-00-00-00-00-00-00-00 + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataSectionStringLiterals_FieldRvaSupported() + { + var parseOptions = TestOptions.Regular.WithFeature("experimental-data-section-string-literals", "0"); + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.Skipped, parseOptions: parseOptions) + .AddBaseline( + source: """ + class C + { + string F() => "0123456789"; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=10", "E353667619EC664B49655FC9692165FB"); + g.VerifyFieldDefNames("84D89877F0D4041EFB6BF91A16F0248F2FD573E6AF05C19F96BEDB9F882F7882", "s"); + g.VerifyMethodDefNames("F", ".ctor", "BytesToString", ".cctor"); + }) + .AddGeneration( + source: """ + class C + { + string F() => "0123456789X"; + } + """, + edits: + [ + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + ], + validator: g => + { + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=11", "6D2201523542AEFFB91657B2AEBDC84B"); + g.VerifyFieldDefNames("ACE59E7D984CCEB2D860A056A3386344236CE5C42C978E26ECE3F35956DAC3AD", "s"); + g.VerifyMethodDefNames("F", "BytesToString", ".cctor"); + + g.VerifyEncLogDefinitions( + [ + Row(6, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(7, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(8, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(6, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(3, TableIndex.Field, EditAndContinueOperation.Default), + Row(8, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(4, TableIndex.Field, EditAndContinueOperation.Default), + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(6, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(5, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(8, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(6, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(3, TableIndex.Param, EditAndContinueOperation.Default), + Row(5, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(4, TableIndex.Param, EditAndContinueOperation.Default), + Row(6, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(2, TableIndex.ClassLayout, EditAndContinueOperation.Default), + Row(2, TableIndex.FieldRva, EditAndContinueOperation.Default), + Row(3, TableIndex.NestedClass, EditAndContinueOperation.Default), + Row(4, TableIndex.NestedClass, EditAndContinueOperation.Default) + ]); + + g.VerifyEncMapDefinitions( + [ + Handle(6, TableIndex.TypeDef), + Handle(7, TableIndex.TypeDef), + Handle(8, TableIndex.TypeDef), + Handle(3, TableIndex.Field), + Handle(4, TableIndex.Field), + Handle(1, TableIndex.MethodDef), + Handle(5, TableIndex.MethodDef), + Handle(6, TableIndex.MethodDef), + Handle(3, TableIndex.Param), + Handle(4, TableIndex.Param), + Handle(6, TableIndex.CustomAttribute), + Handle(2, TableIndex.ClassLayout), + Handle(2, TableIndex.FieldRva), + Handle(3, TableIndex.NestedClass), + Handle(4, TableIndex.NestedClass) + ]); + + g.VerifyIL("C.F", """ + { + // Code size 6 (0x6) + .maxstack 1 + IL_0000: ldsfld "string #1.6D2201523542AEFFB91657B2AEBDC84B.s" + IL_0005: ret + } + """); + + // trailing zeros for alignment: + g.VerifyEncFieldRvaData($""" + ACE59E7D984CCEB2D860A056A3386344236CE5C42C978E26ECE3F35956DAC3AD: {BitConverter.ToString(Encoding.UTF8.GetBytes("0123456789X"))}-00 + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataSectionStringLiterals_FieldRvaNotSupported() + { + var parseOptions = TestOptions.Regular.WithFeature("experimental-data-section-string-literals", "0"); + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.Skipped, parseOptions: parseOptions) + .AddBaseline( + source: """ + class C + { + string F() => "0123456789"; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C", "", "__StaticArrayInitTypeSize=10", "E353667619EC664B49655FC9692165FB"); + g.VerifyFieldDefNames("84D89877F0D4041EFB6BF91A16F0248F2FD573E6AF05C19F96BEDB9F882F7882", "s"); + g.VerifyMethodDefNames("F", ".ctor", "BytesToString", ".cctor"); + }) + .AddGeneration( + source: """ + class C + { + string F() => "0123456789X"; + } + """, + edits: + [ + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + ], + validator: g => + { + g.VerifyTypeDefNames(); + g.VerifyFieldDefNames(); + g.VerifyMethodDefNames("F"); + + g.VerifyEncLogDefinitions( + [ + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default) + ]); + + g.VerifyEncMapDefinitions( + [ + Handle(1, TableIndex.MethodDef) + ]); + + g.VerifyIL("C.F", """ + { + // Code size 6 (0x6) + .maxstack 1 + IL_0000: ldstr "0123456789X" + IL_0005: ret + } + """); + }) + .Verify(); + } + + [Fact] + [WorkItem("https://github.com/dotnet/roslyn/issues/69480")] + public void PrivateImplDetails_DataSectionStringLiterals_HeapOverflow_FieldRvaSupported() + { + // The longest string that can fit in the #US heap. The next string would overflow the heap. + var baseString = new string('x', (1 << 23) - 3); + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.Skipped) + .AddBaseline( + source: $$""" + class C + { + string F() => "{{baseString}}"; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C"); + g.VerifyFieldDefNames(); + g.VerifyMethodDefNames("F", ".ctor"); + }) + .AddGeneration( + source: """ + class C + { + string F() => "0123456789"; + } + """, + edits: + [ + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + ], + validator: g => + { + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=10", "E353667619EC664B49655FC9692165FB"); + g.VerifyFieldDefNames("84D89877F0D4041EFB6BF91A16F0248F2FD573E6AF05C19F96BEDB9F882F7882", "s"); + g.VerifyMethodDefNames("F", "BytesToString", ".cctor"); + + g.VerifyEncLogDefinitions( + [ + Row(3, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(4, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(3, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(1, TableIndex.Field, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(2, TableIndex.Field, EditAndContinueOperation.Default), + Row(1, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(3, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(3, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(4, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(3, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(1, TableIndex.Param, EditAndContinueOperation.Default), + Row(3, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(2, TableIndex.Param, EditAndContinueOperation.Default), + Row(4, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(1, TableIndex.ClassLayout, EditAndContinueOperation.Default), + Row(1, TableIndex.FieldRva, EditAndContinueOperation.Default), + Row(1, TableIndex.NestedClass, EditAndContinueOperation.Default), + Row(2, TableIndex.NestedClass, EditAndContinueOperation.Default) + ]); + + g.VerifyEncMapDefinitions( + [ + Handle(3, TableIndex.TypeDef), + Handle(4, TableIndex.TypeDef), + Handle(5, TableIndex.TypeDef), + Handle(1, TableIndex.Field), + Handle(2, TableIndex.Field), + Handle(1, TableIndex.MethodDef), + Handle(3, TableIndex.MethodDef), + Handle(4, TableIndex.MethodDef), + Handle(1, TableIndex.Param), + Handle(2, TableIndex.Param), + Handle(4, TableIndex.CustomAttribute), + Handle(1, TableIndex.ClassLayout), + Handle(1, TableIndex.FieldRva), + Handle(1, TableIndex.NestedClass), + Handle(2, TableIndex.NestedClass) + ]); + + g.VerifyIL("C.F", """ + { + // Code size 6 (0x6) + .maxstack 1 + IL_0000: ldsfld "string #1.E353667619EC664B49655FC9692165FB.s" + IL_0005: ret + } + """); + + // trailing zeros for alignment: + g.VerifyEncFieldRvaData($""" + 84D89877F0D4041EFB6BF91A16F0248F2FD573E6AF05C19F96BEDB9F882F7882: {BitConverter.ToString(Encoding.UTF8.GetBytes("0123456789"))}-00-00 + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + public void PrivateImplDetails_DataSectionStringLiterals_StringReuse_FieldRvaSupported() + { + // Literals are currently only reused within generation. + + var baseString = new string('x', (1 << 23) - 100); + var newString1 = new string('1', 40); + var newString2 = new string('2', 80); + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.Skipped) + .AddBaseline( + source: $$""" + class C + { + void G(string a, string b, string c) {} + + void F() => G("{{baseString}}", "{{newString1}}", ""); + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C"); + g.VerifyFieldDefNames(); + g.VerifyMethodDefNames("G", "F", ".ctor"); + }) + .AddGeneration( + source: $$""" + class C + { + void G(string a, string b, string c) {} + + void F() => G("{{newString2}}", "{{newString2}}", "{{newString1}}"); + } + """, + edits: + [ + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + ], + validator: g => + { + g.VerifyTypeDefNames("#1", "__StaticArrayInitTypeSize=40", "62CF64E173E5BF9EF5312BB6D57CC26C"); + g.VerifyFieldDefNames("468D019EA81224AECA7EE270B11959D8A187F6F0B6A3FEBFF1C34DC1D66C8D85", "s"); + g.VerifyMethodDefNames("F", "BytesToString", ".cctor"); + + g.VerifyEncLogDefinitions( + [ + Row(3, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(4, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.Default), + Row(3, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(1, TableIndex.Field, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddField), + Row(2, TableIndex.Field, EditAndContinueOperation.Default), + Row(2, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(3, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(4, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(5, TableIndex.TypeDef, EditAndContinueOperation.AddMethod), + Row(5, TableIndex.MethodDef, EditAndContinueOperation.Default), + Row(4, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(4, TableIndex.Param, EditAndContinueOperation.Default), + Row(4, TableIndex.MethodDef, EditAndContinueOperation.AddParameter), + Row(5, TableIndex.Param, EditAndContinueOperation.Default), + Row(4, TableIndex.CustomAttribute, EditAndContinueOperation.Default), + Row(1, TableIndex.ClassLayout, EditAndContinueOperation.Default), + Row(1, TableIndex.FieldRva, EditAndContinueOperation.Default), + Row(1, TableIndex.NestedClass, EditAndContinueOperation.Default), + Row(2, TableIndex.NestedClass, EditAndContinueOperation.Default) + ]); + + g.VerifyEncMapDefinitions( + [ + Handle(3, TableIndex.TypeDef), + Handle(4, TableIndex.TypeDef), + Handle(5, TableIndex.TypeDef), + Handle(1, TableIndex.Field), + Handle(2, TableIndex.Field), + Handle(2, TableIndex.MethodDef), + Handle(4, TableIndex.MethodDef), + Handle(5, TableIndex.MethodDef), + Handle(4, TableIndex.Param), + Handle(5, TableIndex.Param), + Handle(4, TableIndex.CustomAttribute), + Handle(1, TableIndex.ClassLayout), + Handle(1, TableIndex.FieldRva), + Handle(1, TableIndex.NestedClass), + Handle(2, TableIndex.NestedClass) + ]); + + g.VerifyIL("C.F", """ + { + // Code size 23 (0x17) + .maxstack 4 + IL_0000: ldarg.0 + IL_0001: ldstr "22222222222222222222222222222222222222222222222222222222222222222222222222222222" + IL_0006: ldstr "22222222222222222222222222222222222222222222222222222222222222222222222222222222" + IL_000b: ldsfld "string #1.62CF64E173E5BF9EF5312BB6D57CC26C.s" + IL_0010: call "void C.G(string, string, string)" + IL_0015: nop + IL_0016: ret + } + """); + }, + options: new EmitDifferenceOptions() { EmitFieldRva = true }) + .Verify(); + } + + [Fact] + public void PrivateImplDetails_DataSectionStringLiterals_HeapOverflow_FieldRvaNotSupported() + { + // The max number of bytes that can fit into #US the heap is 2^29 - 1, + // but each string also needs to have an offset < 0x1000000 (2^24) to be addressable by a token. + // If the string is larger than that the next string can't be emitted. + var baseString = new string('x', 1 << 23); + + using var _ = new EditAndContinueTest(targetFramework: TargetFramework.Net90, verification: Verification.Skipped) + .AddBaseline( + source: $$""" + class C + { + string F() => "{{baseString}}"; + } + """, + validator: g => + { + g.VerifyTypeDefNames("", "C"); + g.VerifyFieldDefNames(); + g.VerifyMethodDefNames("F", ".ctor"); + }) + .AddGeneration( + source: """ + class C + { + string F() => "new string that doesn't fit"; + } + """, + edits: + [ + Edit(SemanticEditKind.Update, symbolProvider: c => c.GetMember("C.F")), + ], + expectedErrors: + [ + // (3,19): error CS9307: Combined length of user strings used by the program exceeds allowed limit. Adding a string literal requires restarting the application. + // string F() => "new string that doesn't fit"; + Diagnostic(ErrorCode.ERR_TooManyUserStrings_RestartRequired, @"""new string that doesn't fit""").WithLocation(3, 19) + ]) + .Verify(); + } + [Theory] [InlineData("ComputeStringHash", "string")] [InlineData("ComputeSpanHash", "Span")] diff --git a/src/roslyn/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs b/src/roslyn/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs index ee1c3924b64..4df892712c4 100644 --- a/src/roslyn/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs +++ b/src/roslyn/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs @@ -919,7 +919,7 @@ public static partial class Extensions } [Fact] - public void ExtensionIndex_TwoExtensions_SameSignatures_01() + public void ExtensionIndex_TwoExtensions_01() { var src = """ public static class Extensions @@ -1560,7 +1560,7 @@ [0] int32 } [Fact] - public void ExtensionIndex_TwoExtensions_SameSignatures_02() + public void ExtensionIndex_TwoExtensions_02() { var src = """ public static class Extensions @@ -1585,12 +1585,12 @@ class C { } var extension2 = tree.GetRoot().DescendantNodes().OfType().Last(); var symbol2 = model.GetDeclaredSymbol(extension2); var sourceExtension2 = symbol2.GetSymbol(); - Assert.Equal("<>E__2`1", symbol2.MetadataName); - Assert.Equal("Extensions.<>E__2", symbol2.ToTestDisplayString()); + Assert.Equal("<>E__1`1", symbol2.MetadataName); + Assert.Equal("Extensions.<>E__1", symbol2.ToTestDisplayString()); } [Fact] - public void ExtensionIndex_TwoExtensions_SameSignatures_03() + public void ExtensionIndex_TwoExtensions_03() { var src = """ extension(T) { } @@ -1618,12 +1618,12 @@ class C { } var extension2 = tree.GetRoot().DescendantNodes().OfType().Last(); var symbol2 = model.GetDeclaredSymbol(extension2); var sourceExtension2 = symbol2.GetSymbol(); - Assert.Equal("<>E__2`1", symbol2.MetadataName); - Assert.Equal("<>E__2", symbol2.ToTestDisplayString()); + Assert.Equal("<>E__1`1", symbol2.MetadataName); + Assert.Equal("<>E__1", symbol2.ToTestDisplayString()); } [Fact] - public void ExtensionIndex_TwoExtensions_DifferentSignatures_01() + public void ExtensionIndex_TwoExtensions_05() { var src = """ public static class Extensions @@ -1652,7 +1652,7 @@ public static class Extensions } [Fact] - public void ExtensionIndex_TwoExtensions_DifferentSignatures_02() + public void ExtensionIndex_TwoExtensions_06() { var src = """ public static class Extensions @@ -1695,6 +1695,7 @@ public static class Extensions extension(T8 o8) { } extension(T9 o9) { } extension(T10 o10) { } + class C { } extension(T11 o11) { } } """; diff --git a/src/roslyn/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataHelpersTests.cs b/src/roslyn/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataHelpersTests.cs index 63341865aa1..b6494e4c279 100644 --- a/src/roslyn/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataHelpersTests.cs +++ b/src/roslyn/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataHelpersTests.cs @@ -503,5 +503,16 @@ public void ObfuscatedNamespaceNames_02() Assert.Equal("a", nestedNamespaces.ElementAt(0).Key); Assert.Equal("b", nestedNamespaces.ElementAt(1).Key); } + + [Theory] + [InlineData("")] + [InlineData("abc")] + [InlineData("\u1234")] + public static void GetUserStringBlobSize(string str) + { + var builder = new BlobBuilder(); + builder.WriteUserString(str); + Assert.Equal(builder.Count, MetadataHelpers.GetUserStringBlobSize(str)); + } } } diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilder.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilder.cs index 2a170dbc2ff..3d7af821514 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilder.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilder.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#nullable disable - using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Reflection; using System.Reflection.Metadata; using Microsoft.CodeAnalysis.Debugging; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; @@ -20,20 +20,21 @@ namespace Microsoft.CodeAnalysis.CodeGen internal sealed partial class ILBuilder { private readonly OptimizationLevel _optimizations; - internal readonly LocalSlotManager LocalSlotManager; + internal readonly LocalSlotManager? LocalSlotManager; + private readonly DiagnosticBag _diagnostics; private readonly LocalScopeManager _scopeManager; // internal for testing - internal readonly ITokenDeferral module; + internal readonly CommonPEModuleBuilder module; //leader block is the entry point of the method body internal readonly BasicBlock leaderBlock; private EmitState _emitState; - private BasicBlock _lastCompleteBlock; - private BasicBlock _currentBlock; + private BasicBlock? _lastCompleteBlock; + private BasicBlock? _currentBlock; - private SyntaxTree _lastSeqPointTree; + private SyntaxTree? _lastSeqPointTree; private readonly SmallDictionary _labelInfos; private readonly bool _areLocalsZeroed; @@ -42,11 +43,11 @@ internal sealed partial class ILBuilder // This data is only relevant when builder has been realized. internal ImmutableArray RealizedIL; internal ImmutableArray RealizedExceptionHandlers; - internal SequencePointList RealizedSequencePoints; + internal SequencePointList? RealizedSequencePoints; // debug sequence points from all blocks, note that each // sequence point references absolute IL offset via IL marker - public ArrayBuilder SeqPointsOpt; + public ArrayBuilder? SeqPointsOpt; ///
/// In some cases we have to get a final IL offset during emit phase, for example for @@ -60,17 +61,19 @@ internal sealed partial class ILBuilder /// will be put into array. Note that only markers from reachable blocks /// are materialized, the rest will have offset -1. ///
- private ArrayBuilder _allocatedILMarkers; + private ArrayBuilder? _allocatedILMarkers; // Since blocks are created lazily in GetCurrentBlock, // pendingBlockCreate is set to true when a block must be // created, in particular for leader blocks in exception handlers. private bool _pendingBlockCreate; - internal ILBuilder(ITokenDeferral module, LocalSlotManager localSlotManager, OptimizationLevel optimizations, bool areLocalsZeroed) + internal ILBuilder(CommonPEModuleBuilder module, LocalSlotManager? localSlotManager, DiagnosticBag diagnostics, OptimizationLevel optimizations, bool areLocalsZeroed) { this.module = module; this.LocalSlotManager = localSlotManager; + + _diagnostics = diagnostics; _emitState = default(EmitState); _scopeManager = new LocalScopeManager(); @@ -95,6 +98,7 @@ private BasicBlock GetCurrentBlock() return _currentBlock; } + [MemberNotNull(nameof(_currentBlock))] private void CreateBlock() { Debug.Assert(_currentBlock == null); @@ -103,6 +107,7 @@ private void CreateBlock() UpdatesForCreatedBlock(block); } + [MemberNotNull(nameof(_currentBlock))] private SwitchBlock CreateSwitchBlock() { // end the current block @@ -113,10 +118,13 @@ private SwitchBlock CreateSwitchBlock() return switchBlock; } + [MemberNotNull(nameof(_currentBlock))] private void UpdatesForCreatedBlock(BasicBlock block) { - _currentBlock = block; + Debug.Assert(_lastCompleteBlock != null); Debug.Assert(_lastCompleteBlock.NextBlock == null); + + _currentBlock = block; _lastCompleteBlock.NextBlock = block; _pendingBlockCreate = false; ReconcileTrailingMarkers(); @@ -153,29 +161,33 @@ private void ReconcileTrailingMarkers() // should be moved to the next block if (_lastCompleteBlock != null && _lastCompleteBlock.BranchCode == ILOpCode.Nop && - _lastCompleteBlock.LastILMarker >= 0 && - _allocatedILMarkers[_lastCompleteBlock.LastILMarker].BlockOffset == _lastCompleteBlock.RegularInstructionsLength) + _lastCompleteBlock.LastILMarker >= 0) { - int startMarker = -1; - int endMarker = -1; + Debug.Assert(_allocatedILMarkers != null); - while (_lastCompleteBlock.LastILMarker >= 0 && - _allocatedILMarkers[_lastCompleteBlock.LastILMarker].BlockOffset == _lastCompleteBlock.RegularInstructionsLength) + if (_allocatedILMarkers[_lastCompleteBlock.LastILMarker].BlockOffset == _lastCompleteBlock.RegularInstructionsLength) { - Debug.Assert((startMarker < 0) || (startMarker == (_lastCompleteBlock.LastILMarker + 1))); - startMarker = _lastCompleteBlock.LastILMarker; - if (endMarker < 0) + int startMarker = -1; + int endMarker = -1; + + while (_lastCompleteBlock.LastILMarker >= 0 && + _allocatedILMarkers[_lastCompleteBlock.LastILMarker].BlockOffset == _lastCompleteBlock.RegularInstructionsLength) { - endMarker = _lastCompleteBlock.LastILMarker; + Debug.Assert((startMarker < 0) || (startMarker == (_lastCompleteBlock.LastILMarker + 1))); + startMarker = _lastCompleteBlock.LastILMarker; + if (endMarker < 0) + { + endMarker = _lastCompleteBlock.LastILMarker; + } + _lastCompleteBlock.RemoveTailILMarker(_lastCompleteBlock.LastILMarker); } - _lastCompleteBlock.RemoveTailILMarker(_lastCompleteBlock.LastILMarker); - } - BasicBlock current = this.GetCurrentBlock(); - for (int marker = startMarker; marker <= endMarker; marker++) - { - current.AddILMarker(marker); - _allocatedILMarkers[marker] = new ILMarker() { BlockOffset = (int)current.RegularInstructionsLength, AbsoluteOffset = -1 }; + BasicBlock current = this.GetCurrentBlock(); + for (int marker = startMarker; marker <= endMarker; marker++) + { + current.AddILMarker(marker); + _allocatedILMarkers[marker] = new ILMarker() { BlockOffset = (int)current.RegularInstructionsLength, AbsoluteOffset = -1 }; + } } } } @@ -369,7 +381,7 @@ private static void RedirectBranchToBlockedDestination(BasicBlock block, object // if branch is blocked by a nonterminating finally, // returns label for a landing block used as a target of blocked branches // Otherwise returns null - private static object BlockedBranchDestination(BasicBlock src, BasicBlock dest) + private static object? BlockedBranchDestination(BasicBlock src, BasicBlock dest) { var srcHandler = src.EnclosingHandler; @@ -382,9 +394,9 @@ private static object BlockedBranchDestination(BasicBlock src, BasicBlock dest) return BlockedBranchDestinationSlow(dest.EnclosingHandler, srcHandler); } - private static object BlockedBranchDestinationSlow(ExceptionHandlerScope destHandler, ExceptionHandlerScope srcHandler) + private static object? BlockedBranchDestinationSlow(ExceptionHandlerScope destHandler, ExceptionHandlerScope srcHandler) { - ScopeInfo destHandlerScope = null; + ScopeInfo? destHandlerScope = null; if (destHandler != null) { destHandlerScope = destHandler.ContainingExceptionScope; @@ -516,11 +528,11 @@ private bool ForwardLabelsNoLeaving() var labelInfo = _labelInfos[label]; var targetBlock = labelInfo.bb; - Debug.Assert(!IsSpecialEndHandlerBlock(targetBlock)); + Debug.Assert(targetBlock != null && !IsSpecialEndHandlerBlock(targetBlock)); if (targetBlock.HasNoRegularInstructions) { - BasicBlock targetsTarget = null; + BasicBlock? targetsTarget = null; switch (targetBlock.BranchCode) { case ILOpCode.Br: @@ -576,11 +588,11 @@ private bool ForwardLabelsAllowLeaving() var targetBlock = labelInfo.bb; - Debug.Assert(!IsSpecialEndHandlerBlock(targetBlock)); + Debug.Assert(targetBlock != null && !IsSpecialEndHandlerBlock(targetBlock)); if (targetBlock.HasNoRegularInstructions) { - BasicBlock targetsTarget = null; + BasicBlock? targetsTarget = null; switch (targetBlock.BranchCode) { case ILOpCode.Br: @@ -898,6 +910,8 @@ private void RealizeBlocks() Debug.Assert(blockLastMarker >= blockFirstMarker); for (int i = blockFirstMarker; i <= blockLastMarker; i++) { + Debug.Assert(_allocatedILMarkers != null); + int blockOffset = _allocatedILMarkers[i].BlockOffset; int absoluteOffset = writer.Count + blockOffset; _allocatedILMarkers[i] = new ILMarker() { BlockOffset = blockOffset, AbsoluteOffset = absoluteOffset }; @@ -1099,7 +1113,7 @@ internal bool IsJustPastLabel() return _emitState.InstructionsEmitted == _instructionCountAtLastLabel; } - internal void OpenLocalScope(ScopeType scopeType = ScopeType.Variable, Cci.ITypeReference exceptionType = null) + internal void OpenLocalScope(ScopeType scopeType = ScopeType.Variable, Cci.ITypeReference? exceptionType = null) { if (scopeType == ScopeType.TryCatchFinally && IsJustPastLabel()) { @@ -1267,7 +1281,7 @@ private string GetDebuggerDisplay() if (visType != null) { var method = visType.GetTypeInfo().GetDeclaredMethod("ILBuilderToString"); - return (string)method.Invoke(null, new object[] { this, null, null }); + return (string)method!.Invoke(null, [this, null, null])!; } #endif diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilderEmit.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilderEmit.cs index 03b1f616d8d..80e5bb29a3e 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilderEmit.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/ILBuilderEmit.cs @@ -7,8 +7,6 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; -using Roslyn.Utilities; -using static System.Linq.ImmutableArrayExtensions; namespace Microsoft.CodeAnalysis.CodeGen { @@ -40,15 +38,9 @@ internal void EmitOpCode(ILOpCode code, int stackAdjustment) _emitState.InstructionAdded(); } - internal void EmitToken(string value) + internal void EmitToken(Cci.IReference value, SyntaxNode? syntaxNode, Cci.MetadataWriter.RawTokenEncoding encoding = 0) { - uint token = module?.GetFakeStringTokenForIL(value) ?? 0xFFFF; - this.GetCurrentWriter().WriteUInt32(token); - } - - internal void EmitToken(Cci.IReference value, SyntaxNode? syntaxNode, DiagnosticBag diagnostics, Cci.MetadataWriter.RawTokenEncoding encoding = 0) - { - uint token = module?.GetFakeSymbolTokenForIL(value, syntaxNode, diagnostics) ?? 0xFFFF; + uint token = module.GetFakeSymbolTokenForIL(value, syntaxNode, _diagnostics); if (encoding != Cci.MetadataWriter.RawTokenEncoding.None) { token = Cci.MetadataWriter.GetRawToken(encoding, token); @@ -56,9 +48,9 @@ internal void EmitToken(Cci.IReference value, SyntaxNode? syntaxNode, Diagnostic this.GetCurrentWriter().WriteUInt32(token); } - internal void EmitToken(Cci.ISignature value, SyntaxNode? syntaxNode, DiagnosticBag diagnostics) + internal void EmitToken(Cci.ISignature value, SyntaxNode? syntaxNode) { - uint token = module?.GetFakeSymbolTokenForIL(value, syntaxNode, diagnostics) ?? 0xFFFF; + uint token = module.GetFakeSymbolTokenForIL(value, syntaxNode, _diagnostics); this.GetCurrentWriter().WriteUInt32(token); } @@ -76,11 +68,11 @@ internal void EmitModuleVersionIdStringToken() internal void EmitSourceDocumentIndexToken(Cci.DebugSourceDocument document) { - var token = Cci.MetadataWriter.GetRawToken(Cci.MetadataWriter.RawTokenEncoding.DocumentRowId, module?.GetSourceDocumentIndexForIL(document) ?? 0xFFFF); + var token = Cci.MetadataWriter.GetRawToken(Cci.MetadataWriter.RawTokenEncoding.DocumentRowId, module.GetSourceDocumentIndexForIL(document)); this.GetCurrentWriter().WriteUInt32(token); } - internal void EmitArrayBlockInitializer(ImmutableArray data, SyntaxNode syntaxNode, DiagnosticBag diagnostics) + internal void EmitArrayBlockInitializer(ImmutableArray data, SyntaxNode syntaxNode) { // Emit the call to RuntimeHelpers.InitializeArray, creating the necessary metadata blob if there isn't // already one for this data. Note that this specifies an alignment of 1. This is valid regardless of @@ -100,14 +92,14 @@ internal void EmitArrayBlockInitializer(ImmutableArray data, SyntaxNode sy var initializeArray = module.GetInitArrayHelper(); // map a field to the block (that makes it addressable via a token). - var field = module.GetFieldForData(data, alignment: 1, syntaxNode, diagnostics); + var field = module.GetFieldForData(data, alignment: 1, syntaxNode, _diagnostics); // emit call to the helper EmitOpCode(ILOpCode.Dup); //array EmitOpCode(ILOpCode.Ldtoken); - EmitToken(field, syntaxNode, diagnostics); //block + EmitToken(field, syntaxNode); //block EmitOpCode(ILOpCode.Call, -2); - EmitToken(initializeArray, syntaxNode, diagnostics); + EmitToken(initializeArray, syntaxNode); } ///
@@ -211,6 +203,7 @@ internal void EmitBranch(ILOpCode code, object label, ILOpCode revOpCode = ILOpC ///
/// Primary method for emitting string switch jump table ///
+ /// Associated syntax for diagnostic reporting. /// switch case labels /// fall through label for the jump table /// Local holding the value to switch on. @@ -227,6 +220,7 @@ internal void EmitBranch(ILOpCode code, object label, ILOpCode revOpCode = ILOpC /// Delegate to compute string hash consistent with value of keyHash. /// internal void EmitStringSwitchJumpTable( + SyntaxNode syntax, KeyValuePair[] caseLabels, object fallThroughLabel, LocalOrParameter key, @@ -238,6 +232,7 @@ internal void EmitStringSwitchJumpTable( var emitter = new SwitchStringJumpTableEmitter( this, + syntax, key, caseLabels, fallThroughLabel, @@ -257,11 +252,13 @@ internal void EmitStringSwitchJumpTable( /// This value has already been loaded onto the execution stack. /// /// Primitive type code of switch key. + /// Associated syntax for error reporting. internal void EmitIntegerSwitchJumpTable( KeyValuePair[] caseLabels, object fallThroughLabel, LocalOrParameter key, - Cci.PrimitiveTypeCode keyTypeCode) + Cci.PrimitiveTypeCode keyTypeCode, + SyntaxNode syntax) { Debug.Assert(caseLabels.Length > 0); Debug.Assert(keyTypeCode != Cci.PrimitiveTypeCode.String); @@ -270,7 +267,7 @@ internal void EmitIntegerSwitchJumpTable( // CONSIDER: Currently, only purpose of creating this caseLabels array is for Emitting the jump table. // CONSIDER: If this requirement changes, we may want to pass in ArrayBuilder> instead. - var emitter = new SwitchIntegralJumpTableEmitter(this, caseLabels, fallThroughLabel, keyTypeCode, key); + var emitter = new SwitchIntegralJumpTableEmitter(this, syntax, caseLabels, fallThroughLabel, keyTypeCode, key); emitter.EmitJumpTable(); } @@ -360,7 +357,7 @@ private BasicBlock FinishFilterCondition() ///
/// Generates code that creates an instance of multidimensional array ///
- internal void EmitArrayCreation(Microsoft.Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics) + internal void EmitArrayCreation(Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode) { Debug.Assert(!arrayType.IsSZArray, "should be used only with multidimensional arrays"); @@ -368,13 +365,13 @@ internal void EmitArrayCreation(Microsoft.Cci.IArrayTypeReference arrayType, Syn // idx1, idx2 --> array this.EmitOpCode(ILOpCode.Newobj, 1 - (int)arrayType.Rank); - this.EmitToken(ctor, syntaxNode, diagnostics); + this.EmitToken(ctor, syntaxNode); } ///
/// Generates code that loads an element of a multidimensional array ///
- internal void EmitArrayElementLoad(Microsoft.Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics) + internal void EmitArrayElementLoad(Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode) { Debug.Assert(!arrayType.IsSZArray, "should be used only with multidimensional arrays"); @@ -382,13 +379,13 @@ internal void EmitArrayElementLoad(Microsoft.Cci.IArrayTypeReference arrayType, // this, idx1, idx2 --> value this.EmitOpCode(ILOpCode.Call, -(int)arrayType.Rank); - this.EmitToken(load, syntaxNode, diagnostics); + this.EmitToken(load, syntaxNode); } ///
/// Generates code that loads an address of an element of a multidimensional array. ///
- internal void EmitArrayElementAddress(Microsoft.Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics) + internal void EmitArrayElementAddress(Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode) { Debug.Assert(!arrayType.IsSZArray, "should be used only with multidimensional arrays"); @@ -396,13 +393,13 @@ internal void EmitArrayElementAddress(Microsoft.Cci.IArrayTypeReference arrayTyp // this, idx1, idx2 --> &value this.EmitOpCode(ILOpCode.Call, -(int)arrayType.Rank); - this.EmitToken(address, syntaxNode, diagnostics); + this.EmitToken(address, syntaxNode); } ///
/// Generates code that stores an element of a multidimensional array. ///
- internal void EmitArrayElementStore(Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics) + internal void EmitArrayElementStore(Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode) { Debug.Assert(!arrayType.IsSZArray, "should be used only with multidimensional arrays"); @@ -410,7 +407,7 @@ internal void EmitArrayElementStore(Cci.IArrayTypeReference arrayType, SyntaxNod // this, idx1, idx2, value --> void this.EmitOpCode(ILOpCode.Call, -(2 + (int)arrayType.Rank)); - this.EmitToken(store, syntaxNode, diagnostics); + this.EmitToken(store, syntaxNode); } internal void EmitLoad(LocalOrParameter localOrParameter) @@ -563,7 +560,7 @@ internal void EmitStoreArgumentOpcode(int argNumber) } } - internal void EmitConstantValue(ConstantValue value) + internal void EmitConstantValue(ConstantValue value, SyntaxNode? syntaxNode) { ConstantValueTypeDiscriminator discriminator = value.Discriminator; @@ -608,7 +605,7 @@ internal void EmitConstantValue(ConstantValue value) EmitDoubleConstant(value.DoubleValue); break; case ConstantValueTypeDiscriminator.String: - EmitStringConstant(value.StringValue); + EmitStringConstant(value.StringValue, syntaxNode); break; case ConstantValueTypeDiscriminator.Boolean: EmitBoolConstant(value.BooleanValue); @@ -734,16 +731,70 @@ internal void EmitNullConstant() EmitOpCode(ILOpCode.Ldnull); } - internal void EmitStringConstant(string? value) + internal void EmitStringConstant(string? value, SyntaxNode? syntax) { if (value == null) { EmitNullConstant(); + return; } - else + + // If the length is greater than the specified threshold try ldsfld first and fall back to ldstr. + // Otherwise, try emit ldstr and fall back to ldsfld if emitting EnC delta and the heap is already full. + bool success = (value.Length > module.CommonCompilation.DataSectionStringLiteralThreshold) + ? tryEmitLoadField() || tryEmitLoadString() + : tryEmitLoadString() || (module.PreviousGeneration != null && tryEmitLoadField()); + + if (!success) + { + // emit null to balance eval stack + EmitNullConstant(); + + var messageProvider = module.CommonCompilation.MessageProvider; + int code = module.PreviousGeneration != null ? messageProvider.ERR_TooManyUserStrings_RestartRequired : messageProvider.ERR_TooManyUserStrings; + _diagnostics.Add(messageProvider.CreateDiagnostic(code, syntax?.Location ?? Location.None)); + } + + bool tryEmitLoadString() + { + if (module.TryGetFakeStringTokenForIL(value, out uint token)) + { + EmitOpCode(ILOpCode.Ldstr); + GetCurrentWriter().WriteUInt32(token); + return true; + } + + return false; + } + + bool tryEmitLoadField() { - EmitOpCode(ILOpCode.Ldstr); - EmitToken(value); + var field = tryGetOrCreateField(); + if (field != null) + { + EmitOpCode(ILOpCode.Ldsfld); + EmitToken(field, syntax); + return true; + } + + return false; + } + + Cci.IFieldReference? tryGetOrCreateField() + { + if (!module.FieldRvaSupported) + { + return null; + } + + // Binder should have reported use-site errors for these members. + if (module.CommonCompilation.CommonGetWellKnownTypeMember(WellKnownMember.System_Text_Encoding__get_UTF8) == null || + module.CommonCompilation.CommonGetWellKnownTypeMember(WellKnownMember.System_Text_Encoding__GetString) == null) + { + return null; + } + + return module.TryGetOrCreateFieldForStringValue(value, syntax, _diagnostics); } } diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ITokenDeferral.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/ITokenDeferral.cs deleted file mode 100644 index c11dc6c21a3..00000000000 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/ITokenDeferral.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Immutable; - -namespace Microsoft.CodeAnalysis.CodeGen -{ - internal interface ITokenDeferral - { - uint GetFakeStringTokenForIL(string value); - uint GetFakeSymbolTokenForIL(Cci.IReference value, SyntaxNode? syntaxNode, DiagnosticBag diagnostics); - uint GetFakeSymbolTokenForIL(Cci.ISignature value, SyntaxNode? syntaxNode, DiagnosticBag diagnostics); - uint GetSourceDocumentIndexForIL(Cci.DebugSourceDocument document); - - Cci.IFieldReference GetFieldForData(ImmutableArray data, ushort alignment, SyntaxNode syntaxNode, DiagnosticBag diagnostics); - - ///
Gets a field that may be used to lazily cache an array created to store the specified data.
- /// This is used to cache an array created with the data passed to . - Cci.IFieldReference GetArrayCachingFieldForData(ImmutableArray data, Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics); - - Cci.IFieldReference GetArrayCachingFieldForConstants(ImmutableArray constants, Cci.IArrayTypeReference arrayType, SyntaxNode syntaxNode, DiagnosticBag diagnostics); - - Cci.IMethodReference GetInitArrayHelper(); - - string GetStringFromToken(uint token); - ///
- /// Gets the or corresponding to this token. - ///
- object GetReferenceFromToken(uint token); - - ArrayMethods ArrayMethods { get; } - } -} diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/MethodBody.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/MethodBody.cs index be2d425d5d0..4bc97bba46a 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/MethodBody.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/MethodBody.cs @@ -26,11 +26,11 @@ internal sealed class MethodBody : Cci.IMethodBody // Debug information emitted to Release & Debug PDBs supporting the debugger, EEs and other tools: private readonly ImmutableArray _sequencePoints; private readonly ImmutableArray _localScopes; - private readonly Cci.IImportScope _importScopeOpt; - private readonly string _stateMachineTypeNameOpt; + private readonly Cci.IImportScope? _importScopeOpt; + private readonly string? _stateMachineTypeNameOpt; private readonly ImmutableArray _stateMachineHoistedLocalScopes; private readonly bool _hasDynamicLocalVariables; - private readonly StateMachineMoveNextBodyDebugInfo _stateMachineMoveNextDebugInfoOpt; + private readonly StateMachineMoveNextBodyDebugInfo? _stateMachineMoveNextDebugInfoOpt; // Debug information emitted to Debug PDBs supporting EnC: private readonly DebugId _methodId; @@ -54,23 +54,23 @@ public MethodBody( Cci.IMethodDefinition parent, DebugId methodId, ImmutableArray locals, - SequencePointList sequencePoints, - DebugDocumentProvider debugDocumentProvider, + SequencePointList? sequencePoints, + DebugDocumentProvider? debugDocumentProvider, ImmutableArray exceptionHandlers, bool areLocalsZeroed, bool hasStackalloc, ImmutableArray localScopes, bool hasDynamicLocalVariables, - Cci.IImportScope importScopeOpt, + Cci.IImportScope? importScopeOpt, ImmutableArray lambdaDebugInfo, ImmutableArray orderedLambdaRuntimeRudeEdits, ImmutableArray closureDebugInfo, - string stateMachineTypeNameOpt, + string? stateMachineTypeNameOpt, ImmutableArray stateMachineHoistedLocalScopes, ImmutableArray stateMachineHoistedLocalSlots, ImmutableArray stateMachineAwaiterSlots, StateMachineStatesDebugInfo stateMachineStatesDebugInfo, - StateMachineMoveNextBodyDebugInfo stateMachineMoveNextDebugInfoOpt, + StateMachineMoveNextBodyDebugInfo? stateMachineMoveNextDebugInfoOpt, ImmutableArray codeCoverageSpans, bool isPrimaryConstructor) { @@ -103,13 +103,15 @@ public MethodBody( _isPrimaryConstructor = isPrimaryConstructor; } - private static ImmutableArray GetSequencePoints(SequencePointList? sequencePoints, DebugDocumentProvider debugDocumentProvider) + private static ImmutableArray GetSequencePoints(SequencePointList? sequencePoints, DebugDocumentProvider? debugDocumentProvider) { if (sequencePoints == null || sequencePoints.IsEmpty) { return ImmutableArray.Empty; } + Debug.Assert(debugDocumentProvider != null); + var sequencePointsBuilder = ArrayBuilder.GetInstance(); sequencePoints.GetSequencePoints(debugDocumentProvider, sequencePointsBuilder); return sequencePointsBuilder.ToImmutableAndFree(); @@ -125,7 +127,7 @@ public MethodBody( Cci.IMethodDefinition Cci.IMethodBody.MethodDefinition => _parent; - StateMachineMoveNextBodyDebugInfo Cci.IMethodBody.MoveNextBodyInfo => _stateMachineMoveNextDebugInfoOpt; + StateMachineMoveNextBodyDebugInfo? Cci.IMethodBody.MoveNextBodyInfo => _stateMachineMoveNextDebugInfoOpt; ushort Cci.IMethodBody.MaxStack => _maxStack; @@ -138,9 +140,9 @@ public MethodBody( ///
/// This is a list of the using directives that were in scope for this method body. ///
- Cci.IImportScope Cci.IMethodBody.ImportScope => _importScopeOpt; + Cci.IImportScope? Cci.IMethodBody.ImportScope => _importScopeOpt; - string Cci.IMethodBody.StateMachineTypeName => _stateMachineTypeNameOpt; + string? Cci.IMethodBody.StateMachineTypeName => _stateMachineTypeNameOpt; ImmutableArray Cci.IMethodBody.StateMachineHoistedLocalScopes => _stateMachineHoistedLocalScopes; diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs index 87b9df89e73..3c820cdd06a 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs @@ -327,7 +327,7 @@ internal MappedField GetOrAddDataField(ImmutableArray data, ushort alignme internal static Cci.IFieldReference? TryGetOrCreateFieldForStringValue( string text, CommonPEModuleBuilder moduleBuilder, - SyntaxNode syntaxNode, + SyntaxNode? syntaxNode, DiagnosticBag diagnostics) { if (!text.TryGetUtf8ByteRepresentation(out byte[]? data, out _)) @@ -354,7 +354,7 @@ internal MappedField GetOrAddDataField(ImmutableArray data, ushort alignme var messageProvider = @this.ModuleBuilder.CommonCompilation.MessageProvider; diagnostics.Add(messageProvider.CreateDiagnostic( messageProvider.ERR_DataSectionStringLiteralHashCollision, - syntaxNode.GetLocation(), + syntaxNode?.GetLocation() ?? Location.None, previousText[..Math.Min(previousText.Length, 500)])); } @@ -382,7 +382,7 @@ private Cci.IMethodDefinition GetOrSynthesizeBytesToStringHelper(DiagnosticBag d var encodingGetString = getWellKnownTypeMember(compilation, WellKnownMember.System_Text_Encoding__GetString); TryAddSynthesizedMethod(BytesToStringHelper.Create( - moduleBuilder: (ITokenDeferral)ModuleBuilder, + moduleBuilder: ModuleBuilder, containingType: this, encodingUtf8: encodingUtf8, encodingGetString: encodingGetString, @@ -743,14 +743,14 @@ public DataSectionStringType( var stringField = new DataSectionStringField("s", this); - var staticConstructor = synthesizeStaticConstructor((ITokenDeferral)containingType.ModuleBuilder, containingType, dataField, stringField, bytesToStringHelper, diagnostics); + var staticConstructor = synthesizeStaticConstructor(containingType.ModuleBuilder, this, dataField, stringField, bytesToStringHelper, diagnostics); _fields = [stringField]; _methods = [staticConstructor]; static Cci.IMethodDefinition synthesizeStaticConstructor( - ITokenDeferral module, - Cci.INamespaceTypeDefinition containingType, + CommonPEModuleBuilder module, + Cci.ITypeDefinition containingType, MappedField dataField, DataSectionStringField stringField, Cci.IMethodDefinition bytesToStringHelper, @@ -759,23 +759,24 @@ static Cci.IMethodDefinition synthesizeStaticConstructor( var ilBuilder = new ILBuilder( module, new LocalSlotManager(slotAllocator: null), + diagnostics, OptimizationLevel.Release, areLocalsZeroed: false); // Push the `byte*` field's address. ilBuilder.EmitOpCode(ILOpCode.Ldsflda); - ilBuilder.EmitToken(dataField, null, diagnostics); + ilBuilder.EmitToken(dataField, null); // Push the byte size. ilBuilder.EmitIntConstant(dataField.MappedData.Length); // Call `.BytesToString(byte*, int)`. ilBuilder.EmitOpCode(ILOpCode.Call, -1); - ilBuilder.EmitToken(bytesToStringHelper, null, diagnostics); + ilBuilder.EmitToken(bytesToStringHelper, null); // Store into the corresponding `string` field. ilBuilder.EmitOpCode(ILOpCode.Stsfld); - ilBuilder.EmitToken(stringField, null, diagnostics); + ilBuilder.EmitToken(stringField, null); ilBuilder.EmitRet(isVoid: true); ilBuilder.Realize(); @@ -1173,7 +1174,7 @@ private BytesToStringHelper( } public static BytesToStringHelper Create( - ITokenDeferral moduleBuilder, + CommonPEModuleBuilder moduleBuilder, Cci.INamespaceTypeDefinition containingType, Cci.IMethodReference encodingUtf8, Cci.IMethodReference encodingGetString, @@ -1182,12 +1183,13 @@ public static BytesToStringHelper Create( var ilBuilder = new ILBuilder( moduleBuilder, new LocalSlotManager(slotAllocator: null), + diagnostics, OptimizationLevel.Release, areLocalsZeroed: false); // Call `Encoding.get_UTF8()`. ilBuilder.EmitOpCode(ILOpCode.Call, 1); - ilBuilder.EmitToken(encodingUtf8, null, diagnostics); + ilBuilder.EmitToken(encodingUtf8, null); // Push the `byte*`. ilBuilder.EmitOpCode(ILOpCode.Ldarg_0); @@ -1197,7 +1199,7 @@ public static BytesToStringHelper Create( // Call `Encoding.GetString(byte*, int)`. ilBuilder.EmitOpCode(ILOpCode.Callvirt, -2); - ilBuilder.EmitToken(encodingGetString, null, diagnostics); + ilBuilder.EmitToken(encodingGetString, null); // Return. ilBuilder.EmitRet(isVoid: false); diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/StringTokenMap.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/StringTokenMap.cs new file mode 100644 index 00000000000..a6153ce2867 --- /dev/null +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/StringTokenMap.cs @@ -0,0 +1,71 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Collections.Concurrent; +using System.Collections.Generic; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.CodeGen; + +///
+/// Handles storage of strings referenced via tokens in metadata. When values are stored +/// they are uniquely "associated" with fake tokens, which are basically sequential numbers. +/// IL gen will use these fake tokens during codegen and later, when actual values +/// are known, the method bodies will be patched. +///
+internal sealed class StringTokenMap(int initialHeapSize) +{ + private readonly ConcurrentDictionary _valueToToken = new ConcurrentDictionary(ReferenceEqualityComparer.Instance); + private readonly ArrayBuilder _uniqueValues = []; + private int _heapSize = initialHeapSize; + + public bool TryGetOrAddToken(string value, out uint token) + { + // NOTE: cannot use GetOrAdd here since _uniqueValues and _valueToToken must be in sync + // so if we do need to add we have to take a lock and modify both collections. + if (_valueToToken.TryGetValue(value, out token)) + { + return true; + } + + lock (_uniqueValues) + { + if (_valueToToken.TryGetValue(value, out token)) + { + return true; + } + + // String can span beyond the heap limit, but must start within the limit. + if (_heapSize > MetadataHelpers.UserStringHeapCapacity) + { + return false; + } + + _heapSize += MetadataHelpers.GetUserStringBlobSize(value); + + token = (uint)_uniqueValues.Count; + _uniqueValues.Add(value); + _valueToToken.Add(value, token); + + return true; + } + } + + public string GetValue(uint token) + { + lock (_uniqueValues) + { + return _uniqueValues[(int)token]; + } + } + + public string[] CopyValues() + { + lock (_uniqueValues) + { + return _uniqueValues.ToArray(); + } + } +} diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.cs index 9b57ad3e7bb..d6cbaed2558 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.cs @@ -19,6 +19,11 @@ internal partial struct SwitchIntegralJumpTableEmitter { private readonly ILBuilder _builder; + ///
+ /// Associated syntax for diagnostic reporting. + ///
+ private readonly SyntaxNode _syntax; + ///
/// Switch key for the jump table ///
@@ -48,12 +53,14 @@ internal partial struct SwitchIntegralJumpTableEmitter internal SwitchIntegralJumpTableEmitter( ILBuilder builder, + SyntaxNode syntax, KeyValuePair[] caseLabels, object fallThroughLabel, Cci.PrimitiveTypeCode keyTypeCode, LocalOrParameter key) { _builder = builder; + _syntax = syntax; _key = key; _keyTypeCode = keyTypeCode; _fallThroughLabel = fallThroughLabel; @@ -423,7 +430,7 @@ private void EmitCondBranchForSwitch(ILOpCode branchCode, ConstantValue constant // branch branchCode targetLabel _builder.EmitLoad(_key); - _builder.EmitConstantValue(constant); + _builder.EmitConstantValue(constant, _syntax); _builder.EmitBranch(branchCode, targetLabel, GetReverseBranchCode(branchCode)); } @@ -443,7 +450,7 @@ private void EmitEqBranchForSwitch(ConstantValue constant, object targetLabel) } else { - _builder.EmitConstantValue(constant); + _builder.EmitConstantValue(constant, _syntax); _builder.EmitBranch(ILOpCode.Beq, targetLabel); } } @@ -458,7 +465,7 @@ private void EmitRangeCheckedBranch(ConstantValue startConstant, ConstantValue e // sub if (!startConstant.IsDefaultValue) { - _builder.EmitConstantValue(startConstant); + _builder.EmitConstantValue(startConstant, _syntax); _builder.EmitOpCode(ILOpCode.Sub); } @@ -521,7 +528,7 @@ private void EmitNormalizedSwitchKey(ConstantValue startConstant, ConstantValue // sub if (!startConstant.IsDefaultValue) { - _builder.EmitConstantValue(startConstant); + _builder.EmitConstantValue(startConstant, _syntax); _builder.EmitOpCode(ILOpCode.Sub); } diff --git a/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchStringJumpTableEmitter.cs b/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchStringJumpTableEmitter.cs index d496e0a67be..939427eac69 100644 --- a/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchStringJumpTableEmitter.cs +++ b/src/roslyn/src/Compilers/Core/Portable/CodeGen/SwitchStringJumpTableEmitter.cs @@ -19,6 +19,11 @@ internal readonly struct SwitchStringJumpTableEmitter { private readonly ILBuilder _builder; + ///
+ /// Associated syntax for diagnostic reporting. + ///
+ private readonly SyntaxNode _syntax; + ///
/// Switch key for the jump table ///
@@ -65,6 +70,7 @@ internal readonly struct SwitchStringJumpTableEmitter internal SwitchStringJumpTableEmitter( ILBuilder builder, + SyntaxNode syntax, LocalOrParameter key, KeyValuePair[] caseLabels, object fallThroughLabel, @@ -76,6 +82,7 @@ internal SwitchStringJumpTableEmitter( RoslynDebug.Assert(emitStringCondBranchDelegate != null); _builder = builder; + _syntax = syntax; _key = key; _caseLabels = caseLabels; _fallThroughLabel = fallThroughLabel; @@ -148,6 +155,7 @@ private Dictionary EmitHashBucketJumpTable(Dictionary EmitDifference(baseline, edits, isAddedSymbol, metadataStream, ilStream, pdbStream, EmitDifferenceOptions.Default, cancellationToken); + + ///
+ /// Emit the differences between the compilation and the previous generation + /// for Edit and Continue. The differences are expressed as added and changed + /// symbols, and are emitted as metadata, IL, and PDB deltas. A representation + /// of the current compilation is returned as an EmitBaseline for use in a + /// subsequent Edit and Continue. + ///
+ public EmitDifferenceResult EmitDifference( + EmitBaseline baseline, + IEnumerable edits, + Func isAddedSymbol, + Stream metadataStream, + Stream ilStream, + Stream pdbStream, + EmitDifferenceOptions options, + CancellationToken cancellationToken = default(CancellationToken)) { if (baseline == null) { @@ -3128,7 +3146,7 @@ public EmitDifferenceResult EmitDifference( throw new ArgumentNullException(nameof(pdbStream)); } - return this.EmitDifference(baseline, edits, isAddedSymbol, metadataStream, ilStream, pdbStream, testData: null, cancellationToken); + return this.EmitDifference(baseline, edits, isAddedSymbol, metadataStream, ilStream, pdbStream, options, testData: null, cancellationToken); } #pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters @@ -3139,6 +3157,7 @@ internal abstract EmitDifferenceResult EmitDifference( Stream metadataStream, Stream ilStream, Stream pdbStream, + EmitDifferenceOptions options, CompilationTestData? testData, CancellationToken cancellationToken); @@ -3422,7 +3441,6 @@ internal static bool SerializePeToStream( internal EmitBaseline? SerializeToDeltaStreams( CommonPEModuleBuilder moduleBeingBuilt, DefinitionMap definitionMap, - SymbolChanges changes, Stream metadataStream, Stream ilStream, Stream pdbStream, @@ -3442,7 +3460,6 @@ internal static bool SerializePeToStream( using (nativePdbWriter) { var context = new EmitContext(moduleBeingBuilt, diagnostics, metadataOnly: false, includePrivateMembers: true); - var deletedMethodDefs = DeltaMetadataWriter.CreateDeletedMethodsDefs(context, changes); // Map the definitions from the previous compilation to the current compilation. // This must be done after compiling since synthesized definitions (generated when compiling method bodies) @@ -3460,8 +3477,6 @@ internal static bool SerializePeToStream( baseline, encId, definitionMap, - changes, - deletedMethodDefs, cancellationToken); moduleBeingBuilt.TestData?.SetMetadataWriter(writer); @@ -3497,7 +3512,7 @@ internal static bool SerializePeToStream( } finally { - foreach (var (_, builder) in deletedMethodDefs) + foreach (var (_, builder) in moduleBeingBuilt.GetDeletedMethodDefinitions()) { builder.Free(); } diff --git a/src/roslyn/src/Compilers/Core/Portable/Compilation/EmitDifferenceOptions.cs b/src/roslyn/src/Compilers/Core/Portable/Compilation/EmitDifferenceOptions.cs new file mode 100644 index 00000000000..b793f7cad97 --- /dev/null +++ b/src/roslyn/src/Compilers/Core/Portable/Compilation/EmitDifferenceOptions.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.CodeAnalysis.Emit; + +public readonly struct EmitDifferenceOptions() +{ + public static readonly EmitDifferenceOptions Default = new(); + + ///
+ /// True to emit FieldRva table entries. The runtime must support this feature. + ///
+ public bool EmitFieldRva { get; init; } +} diff --git a/src/roslyn/src/Compilers/Core/Portable/Diagnostic/CommonMessageProvider.cs b/src/roslyn/src/Compilers/Core/Portable/Diagnostic/CommonMessageProvider.cs index b662165fee4..6d3310c771b 100644 --- a/src/roslyn/src/Compilers/Core/Portable/Diagnostic/CommonMessageProvider.cs +++ b/src/roslyn/src/Compilers/Core/Portable/Diagnostic/CommonMessageProvider.cs @@ -239,6 +239,7 @@ public string GetIdForErrorCode(int errorCode) public abstract int ERR_MetadataNameTooLong { get; } public abstract int ERR_EncReferenceToAddedMember { get; } public abstract int ERR_TooManyUserStrings { get; } + public abstract int ERR_TooManyUserStrings_RestartRequired { get; } public abstract int ERR_PeWritingFailure { get; } public abstract int ERR_ModuleEmitFailure { get; } public abstract int ERR_EncUpdateFailedMissingSymbol { get; } diff --git a/src/roslyn/src/Compilers/Core/Portable/Emit/CommonPEModuleBuilder.cs b/src/roslyn/src/Compilers/Core/Portable/Emit/CommonPEModuleBuilder.cs index 84be01ad50e..e128038c6aa 100644 --- a/src/roslyn/src/Compilers/Core/Portable/Emit/CommonPEModuleBuilder.cs +++ b/src/roslyn/src/Compilers/Core/Portable/Emit/CommonPEModuleBuilder.cs @@ -7,6 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.Contracts; using System.IO; using System.Linq; using System.Security.Cryptography; @@ -35,19 +37,23 @@ internal abstract class CommonPEModuleBuilder : Cci.IUnit, Cci.IModuleReference private readonly ConcurrentDictionary _methodBodyMap; private readonly TokenMap _referencesInILMap = new(); - private readonly ItemTokenMap _stringsInILMap = new(); + private readonly Lazy _stringsInILMap; private readonly ItemTokenMap _sourceDocumentsInILMap = new(); private ImmutableArray _lazyAssemblyReferenceAliases; private ImmutableArray _lazyManagedResources; private IEnumerable _embeddedTexts = SpecializedCollections.EmptyEnumerable(); + private ArrayMethods? _lazyArrayMethods; + + // Calculated when emitting EnC deltas. + private IReadOnlyDictionary>? _encDeletedMethodDefinitions; // Only set when running tests to allow inspection of the emitted data. internal CompilationTestData? TestData { get; private set; } internal EmitOptions EmitOptions { get; } - public CommonPEModuleBuilder( + protected CommonPEModuleBuilder( IEnumerable manifestResources, EmitOptions emitOptions, OutputKind outputKind, @@ -63,6 +69,7 @@ public CommonPEModuleBuilder( OutputKind = outputKind; SerializationProperties = serializationProperties; _methodBodyMap = new ConcurrentDictionary(ReferenceEqualityComparer.Instance); + _stringsInILMap = new Lazy(() => new StringTokenMap(PreviousGeneration?.UserStringStreamLength ?? 0)); EmitOptions = emitOptions; } @@ -74,6 +81,11 @@ public CommonPEModuleBuilder( ///
public abstract SymbolChanges? EncSymbolChanges { get; } + ///
+ /// True if FieldRVA table is supported by the runtime. + ///
+ public abstract bool FieldRvaSupported { get; } + ///
/// Previous EnC generation baseline, or null if this is not EnC delta. ///
@@ -105,6 +117,27 @@ public CommonPEModuleBuilder( ///