Skip to content

feat: generalise hardcoded peephole optimisation families #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rkalis wants to merge 2 commits into
base: next
Choose a base branch
from
Draft

feat: generalise hardcoded peephole optimisation families #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0948578
feat: generalise hardcoded peephole optimisation families
rkalis Sep 29, 2026
af30e11
test: regenerate the OverlappingScopeCleanup fixture
rkalis Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/cashc/test/generation/fixtures/valid-contract-files/complex_loop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ export const fixtures: Fixture[] = [
contractName: 'Loopy',
constructorInputs: [],
abi: [{ name: 'doLoop', inputs: [] }],
bytecode: 'OP_0 OP_0 OP_0 OP_0 OP_BEGIN OP_DUP OP_UTXOVALUE OP_4 OP_ROLL OP_DROP OP_SWAP OP_2SWAP OP_ROT OP_1ADD OP_TXOUTPUTCOUNT OP_2DUP OP_LESSTHAN OP_DUP OP_IF OP_2 OP_PICK OP_OUTPUTTOKENCATEGORY OP_0 OP_EQUAL OP_NOT OP_NIP OP_DUP OP_IF OP_4 OP_PICK OP_3 OP_PICK OP_OUTPUTVALUE OP_ADD OP_5 OP_ROLL OP_DROP OP_SWAP OP_TOALTSTACK OP_SWAP OP_2SWAP OP_ROT OP_FROMALTSTACK OP_ELSE OP_3 OP_ROLL OP_1ADD OP_SWAP OP_2SWAP OP_ROT OP_ENDIF OP_ENDIF OP_2DROP OP_DUP OP_TXINPUTCOUNT OP_GREATERTHANOREQUAL OP_UNTIL OP_2SWAP OP_GREATERTHAN OP_VERIFY OP_SWAP OP_0 OP_GREATERTHAN OP_NIP',
bytecode: 'OP_0 OP_0 OP_0 OP_0 OP_BEGIN OP_DUP OP_UTXOVALUE OP_4 OP_ROLL OP_DROP OP_SWAP OP_2SWAP OP_ROT OP_1ADD OP_TXOUTPUTCOUNT OP_2DUP OP_LESSTHAN OP_DUP OP_IF OP_2 OP_PICK OP_OUTPUTTOKENCATEGORY OP_0 OP_EQUAL OP_NOT OP_NIP OP_DUP OP_IF OP_4 OP_ROLL OP_3 OP_PICK OP_OUTPUTVALUE OP_ADD OP_SWAP OP_TOALTSTACK OP_SWAP OP_2SWAP OP_ROT OP_FROMALTSTACK OP_ELSE OP_3 OP_ROLL OP_1ADD OP_SWAP OP_2SWAP OP_ROT OP_ENDIF OP_ENDIF OP_2DROP OP_DUP OP_TXINPUTCOUNT OP_GREATERTHANOREQUAL OP_UNTIL OP_2SWAP OP_GREATERTHAN OP_VERIFY OP_SWAP OP_0 OP_GREATERTHAN OP_NIP',
debug: {
bytecode: '000000006576c6547a757c727b8bc46e9f76635279d100879177766354795379cc93557a757c6b7c727b6c67537a8b7c727b68686d76c3a26672a0697c00a077',
sourceMap: '3:23:3:24;4:24:4:25;5:25:5:26;6:16:6:17;8:8:26:39;9:33:9:34;:23::41:1;:12::42;;;;;;10::10:22;12:20:12:37:0;13:21:13:26;::::1;15:16:15:17:0;:19:25:13;16:31:16:32;;:20::47:1;:51::53:0;:20:::1;;:16::54;18:20:18:21:0;:23:20:17;19:32:19:41;;:55::56;;:44::63:1;:32;:20::64;;;;;;;;;20:23:22:17:0;21:20:21:48:1;;;;;;20:23:22:17;15:19:25:13;8:11:26:9;26:17::18:0;:21::37;8:8::39:1;;28:16:28:36:0;::::1;:8::38;29:16:29:26:0;:29::30;:8::32:1;2:22:30:5',
bytecode: '000000006576c6547a757c727b8bc46e9f76635279d1008791777663547a5379cc937c6b7c727b6c67537a8b7c727b68686d76c3a26672a0697c00a077',
sourceMap: '3:23:3:24;4:24:4:25;5:25:5:26;6:16:6:17;8:8:26:39;9:33:9:34;:23::41:1;:12::42;;;;;;10:16:10:21;12:20:12:37:0;13:21:13:26;::::1;15:16:15:17:0;:19:25:13;16:31:16:32;;:20::47:1;:51::53:0;:20:::1;;:16::54;18:20:18:21:0;:23:20:17;19:32:19:41;;:55::56;;:44::63:1;:32;:20::64;;;;;;20:23:22:17:0;21:33:21:43;;:::47:1;:20::48;;;20:23:22:17;15:19:25:13;8:11:26:9;26:17::18:0;:21::37;8:8::39:1;;28:16:28:36:0;::::1;:8::38;29:16:29:26:0;:29::30;:8::32:1;2:22:30:5',
logs: [
{ ip: 51, line: 24, data: [{ stackIndex: 3, type: 'int', ip: 51 }] },
{ ip: 48, line: 24, data: [{ stackIndex: 3, type: 'int', ip: 48 }] },
],
requires: [
{ ip: 59, line: 28 },
{ ip: 63, line: 29 },
{ ip: 56, line: 28 },
{ ip: 60, line: 29 },
],
sourceTags: '52:52:sc;63:63:sc',
sourceTags: '49:49:sc;60:60:sc',
},
fingerprint: '0dfd8b49c1d5e3af83759f9921d61901e5dbfa99e2b2afbe490e9bb3fba813f5',
fingerprint: 'f20852ce7ad768a7fdd7596dc66e619dea42aaeb2c2a8f5af7622efc41999a65',
},
},
];
14 changes: 7 additions & 7 deletions packages/cashc/test/generation/fixtures/valid-contract-files/compound_assign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ export const fixtures: Fixture[] = [
// require(x == 15);
+ 'OP_DUP OP_15 OP_NUMEQUALVERIFY '
// x -= 3;
+ 'OP_DUP OP_3 OP_SUB '
+ 'OP_3 OP_SUB '
// require(x == 12);
+ 'OP_12 OP_NUMEQUAL '
// Cleanup
+ 'OP_NIP OP_NIP',
fingerprint: '3e67ebf63dbbf278589d0fffe8dd94663758334a8bf7858ea9c3613cd472b190',
+ 'OP_NIP',
fingerprint: 'c67fdea7bf9a5f18f19e1940adefc1f4b9add4f1957c1c0f2d45ae7e2e8eb1e6',
debug: {
bytecode: '5a765593765f9d7653945c9c7777',
sourceMap: '3:16:3:18;4:8:4:9;:13::14;:8:::1;5:16:5:17:0;:21::23;:8::25:1;7::7:9:0;:13::14;:8:::1;8:21:8:23:0;:8::25:1;2:21:9:5;',
bytecode: '5a765593765f9d53945c9c77',
sourceMap: '3:16:3:18;4:8:4:9;:13::14;:8:::1;5:16:5:17:0;:21::23;:8::25:1;7:13:7:14:0;:8:::1;8:21:8:23:0;:8::25:1;2:21:9:5',
logs: [],
requires: [{ ip: 6, line: 5 }, { ip: 12, line: 8 }],
sourceTags: '12:13:sc',
requires: [{ ip: 6, line: 5 }, { ip: 11, line: 8 }],
sourceTags: '11:11:sc',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cashc/test/generation/fixtures/valid-contract-files/deep_increment_decrement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const fixtures: Fixture[] = [
+ 'OP_ENDIF',
debug: {
bytecode: '76009c637800515253006576539f766b63557a8c7c6b7c6b7c727b6c6c547a8b7c6b7c727b6c8b686c9166757b7b9393569d937b9c7767519d6e9f638c7c8c7c7b8c7b7b68939300a068',
sourceMap: '2:4:16:5;;;;3:24:3:30;4:20:4:21;5:16:5:17;6::6;7::7;9:21:9:22;:8:12:9;:24:9:25;:28::29;:24:::1;;;:36:12:9:0;10:12:10:38:1;;;;;;;;;;;;11::11:30;;;;;;;;;9:31:9:34;:36:12:9;;:8;;;14:16:14:17:0;:20::21;:16:::1;:::25;:29::30:0;:8::32:1;15:16:15:33;:37::43:0;:8::45:1;2:30:16:5;:4;18::26::0;;19:12:19:17;::::1;:19:23:9:0;20:12:20:22:1;21::21;;;22::22;;;;19:19:23:9;25:16:25:21;:::25;:28::29:0;:8::31:1;1:0:27:1',
sourceMap: '2:4:16:5;;;;3:24:3:30;4:20:4:21;5:16:5:17;6::6;7::7;9:21:9:22;:8:12:9;:24:9:25;:28::29;:24:::1;;;:36:12:9:0;10:24:10:33;;:::37:1;:12::38;;;;;;;;;11:20:11:25:0;;:::29:1;:12::30;;;;;;9:31:9:34;:36:12:9;;:8;;;14:16:14:17:0;:20::21;:16:::1;:::25;:29::30:0;:8::32:1;15:16:15:33;:37::43:0;:8::45:1;2:30:16:5;:4;18::26::0;;19:12:19:17;::::1;:19:23:9:0;20:16:20:21:1;21::21:17:0;:::21:1;:12::22;22:16:22:17:0;:::21:1;:12::22;;19:19:23:9;25:16:25:21;:::25;:28::29:0;:8::31:1;1:0:27:1',
logs: [],
requires: [
{ ip: 49, line: 14 },
Expand Down
2 changes: 1 addition & 1 deletion packages/cashc/test/generation/fixtures/valid-contract-files/do_while_loop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const fixtures: Fixture[] = [
fingerprint: 'a1926f6964606192bb765db69639d46975507c021b233c1456d344398fa5b8f5',
debug: {
bytecode: '00658b76c3a26652a0',
sourceMap: '3:16:3:17;5:8:7:39;6:12:6:22:1;7:17:7:18:0;:21::37;5:8::39:1;;10:20:10:21:0;:8::23:1',
sourceMap: '3:16:3:17;5:8:7:39;6:16:6:21:1;7:17:7:18:0;:21::37;5:8::39:1;;10:20:10:21:0;:8::23:1',
logs: [{ ip: 7, line: 9, data: [{ stackIndex: 0, type: 'int', ip: 7 }] }],
requires: [{ ip: 9, line: 10 }],
},
Expand Down
2 changes: 1 addition & 1 deletion ...ges/cashc/test/generation/fixtures/valid-contract-files/do_while_loop_no_introspection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const fixtures: Fixture[] = [
bytecode: 'OP_0 OP_2 OP_BEGIN OP_SWAP OP_1ADD OP_SWAP OP_2DUP OP_ADD OP_10 OP_LESSTHAN OP_VERIFY OP_OVER OP_10 OP_GREATERTHANOREQUAL OP_UNTIL OP_2DROP OP_1',
debug: {
bytecode: '0052657c8b7c6e935a9f69785aa2666d51',
sourceMap: '3:16:3:17;4::4;6:8:10:25;7:12:7:22:1;;;9:20:9:25:0;::::1;:28::30:0;:20:::1;:12::32;10:17:10:18:0;:21::23;6:8::25:1;;2:22:11:5;',
sourceMap: '3:16:3:17;4::4;6:8:10:25;7:16:7:17;:::21:1;:12::22;9:20:9:25:0;::::1;:28::30:0;:20:::1;:12::32;10:17:10:18:0;:21::23;6:8::25:1;;2:22:11:5;',
logs: [
{ ip: 6, line: 8, data: [{ stackIndex: 1, type: 'int', ip: 6 }] },
],
Expand Down
2 changes: 1 addition & 1 deletion .../cashc/test/generation/fixtures/valid-contract-files/do_while_loop_require_inside_loop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const fixtures: Fixture[] = [
fingerprint: '8ba3e5e6fcc79a8e3fb57ac388692ae3b49fbece9f528e547380b24338a8d8b9',
debug: {
bytecode: '00658b765a9f6976c3a2667551',
sourceMap: '3:16:3:17;5:8:8:39;6:12:6:22:1;7:20:7:21:0;:24::26;:20:::1;:12::28;8:17:8:18:0;:21::37;5:8::39:1;;2:22:9:5;',
sourceMap: '3:16:3:17;5:8:8:39;6:16:6:21:1;7:20:7::0;:24::26;:20:::1;:12::28;8:17:8:18:0;:21::37;5:8::39:1;;2:22:9:5;',
logs: [],
requires: [{ ip: 6, line: 7 }],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cashc/test/generation/fixtures/valid-contract-files/double_negation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const fixtures: Fixture[] = [
+ 'OP_NIP OP_NIP',
debug: {
bytecode: '76690000657c8b7d5479a27776667b637853799d687c00a07777',
sourceMap: '4:18:4:22;:8::24:1;6:16:6:17:0;7:20:7:25;9:8:13:24;10:12:10:22:1;;::11:20:0;11:24::30;;:19:::1;:12::31;13:18:13:22:0;9:8::24:1;16:14:16:18:0;:12:18:9;17:20:17:21;:25::31;;:12::33:1;16:20:18:9;20:16:20:17:0;:20::21;:8::23:1;2:31:21:5;',
sourceMap: '4:18:4:22;:8::24:1;6:16:6:17:0;7:20:7:25;9:8:13:24;10:16:10:17;:::21:1;:12:11:20:0;11:24::30;;:19:::1;:12::31;13:18:13:22:0;9:8::24:1;16:14:16:18:0;:12:18:9;17:20:17:21;:25::31;;:12::33:1;16:20:18:9;20:16:20:17:0;:20::21;:8::23:1;2:31:21:5;',
logs: [],
requires: [
{ ip: 2, line: 4 },
Expand Down
16 changes: 8 additions & 8 deletions packages/cashc/test/generation/fixtures/valid-contract-files/for_loop_stack_items.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ export const fixtures: Fixture[] = [
contractName: 'ForLoopBasic',
constructorInputs: [],
abi: [{ name: 'spend', inputs: [] }],
bytecode: 'OP_0 OP_1 OP_1 OP_0 OP_BEGIN OP_DUP OP_3 OP_LESSTHAN OP_DUP OP_TOALTSTACK OP_IF OP_3 OP_PICK OP_OVER OP_ADD OP_4 OP_ROLL OP_DROP OP_SWAP OP_2SWAP OP_ROT OP_1ADD OP_ENDIF OP_FROMALTSTACK OP_NOT OP_UNTIL OP_DROP OP_ROT OP_3 OP_NUMEQUALVERIFY OP_SWAP OP_1 OP_NUMEQUALVERIFY OP_1 OP_NUMEQUAL',
bytecode: 'OP_0 OP_1 OP_1 OP_0 OP_BEGIN OP_DUP OP_3 OP_LESSTHAN OP_DUP OP_TOALTSTACK OP_IF OP_3 OP_ROLL OP_OVER OP_ADD OP_SWAP OP_2SWAP OP_ROT OP_1ADD OP_ENDIF OP_FROMALTSTACK OP_NOT OP_UNTIL OP_DROP OP_ROT OP_3 OP_NUMEQUALVERIFY OP_SWAP OP_1 OP_NUMEQUALVERIFY OP_1 OP_NUMEQUAL',
debug: {
bytecode: '005151006576539f766b6353797893547a757c727b8b686c9166757b539d7c519d519c',
sourceMap: '3:18:3:19;4:16:4:17;5::5;7:21:7:22;:8:9:9;:24:7:25;:28::29;:24:::1;;;:39:9:9:0;8:18:8:21;;:24::25;:18:::1;:12::26;;;;;;7:31:7:37;:39:9:9;;:8;;;11:16:11:19:0;:23::24;:8::26:1;12:16:12:17:0;:21::22;:8::24:1;13:21:13:22:0;:8::24:1',
bytecode: '005151006576539f766b63537a78937c727b8b686c9166757b539d7c519d519c',
sourceMap: '3:18:3:19;4:16:4:17;5::5;7:21:7:22;:8:9:9;:24:7:25;:28::29;:24:::1;;;:39:9:9:0;8:18:8:21;;:24::25;:18:::1;:12::26;;;7:31:7:37;:39:9:9;;:8;;;11:16:11:19:0;:23::24;:8::26:1;12:16:12:17:0;:21::22;:8::24:1;13:21:13:22:0;:8::24:1',
logs: [],
requires: [
{ ip: 29, line: 11 },
{ ip: 32, line: 12 },
{ ip: 35, line: 13 },
{ ip: 26, line: 11 },
{ ip: 29, line: 12 },
{ ip: 32, line: 13 },
],
sourceTags: '21:21:fu;22:25:lc;26:26:sc',
sourceTags: '18:18:fu;19:22:lc;23:23:sc',
},
fingerprint: 'daa7f96c846a6af3366dd7a2c5597d29524665dce0cc9a5fc5e2a12c97babe2f',
fingerprint: '97fab6cffeffd849fe147d49c58f2bc421022c38a11ec92143cb791c0fbb7900',
},
},
];
2 changes: 1 addition & 1 deletion packages/cashc/test/generation/fixtures/valid-contract-files/for_while_nested.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const fixtures: Fixture[] = [
bytecode: 'OP_0 OP_0 OP_BEGIN OP_DUP OP_2 OP_LESSTHAN OP_DUP OP_TOALTSTACK OP_IF OP_0 OP_BEGIN OP_DUP OP_2 OP_LESSTHAN OP_DUP OP_TOALTSTACK OP_IF OP_3DUP OP_DROP OP_ADD OP_OVER OP_ADD OP_2SWAP OP_NIP OP_ROT OP_1ADD OP_ENDIF OP_FROMALTSTACK OP_NOT OP_UNTIL OP_SWAP OP_1ADD OP_NIP OP_ENDIF OP_FROMALTSTACK OP_NOT OP_UNTIL OP_DROP OP_4 OP_NUMEQUAL',
debug: {
bytecode: '00006576529f766b63006576529f766b636f7593789372777b8b686c91667c8b77686c916675549c',
sourceMap: '3:18:3:19;5:21:5:22;:8:13:9;:24:5:25;:28::29;:24:::1;;;:42:13:9:0;6:20:6:21;8:12:12:13;:19:8:20;:23::24;:19:::1;;;:26:12:13:0;9:22:9:29;;::::1;:32::33:0;:22:::1;:16::34;;;10::10:26;8:26:12:13;;:12;;5:31:5:40;;::13:9;:42;;:8;;;15:23:15:24:0;:8::26:1',
sourceMap: '3:18:3:19;5:21:5:22;:8:13:9;:24:5:25;:28::29;:24:::1;;;:42:13:9:0;6:20:6:21;8:12:12:13;:19:8:20;:23::24;:19:::1;;;:26:12:13:0;9:22:9:29;;::::1;:32::33:0;:22:::1;:16::34;;;10:20:10:25;8:26:12:13;;:12;;5:35:5:36:0;:::40:1;:31:13:9;:42;;:8;;;15:23:15:24:0;:8::26:1',
logs: [
{
ip: 26,
Expand Down
14 changes: 7 additions & 7 deletions ...es/cashc/test/generation/fixtures/valid-contract-files/global_function_in_control_flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const fixtures: Fixture[] = [
// for (int i = 0; i < 3; i = i + 1) {
+ 'OP_0 OP_BEGIN OP_DUP OP_3 OP_LESSTHAN OP_DUP OP_TOALTSTACK OP_IF '
// total = total + triple(x);
+ 'OP_OVER OP_3 OP_PICK OP_3 OP_MUL OP_ADD OP_ROT OP_DROP OP_SWAP '
+ 'OP_SWAP OP_2 OP_PICK OP_3 OP_MUL OP_ADD OP_SWAP '
// For loop update
+ 'OP_1ADD '
// Loop condition
Expand All @@ -33,13 +33,13 @@ export const fixtures: Fixture[] = [
+ 'OP_9 OP_NUMEQUAL '
// Cleanup
+ 'OP_NIP',
fingerprint: 'c14759968b45b80fb6bdf19f487d3dbad06e493976633b61eeb4d1522085b5cc',
fingerprint: 'ea5c2c2a8339e34338cf04379f01f1dd41cfc861e3034ac93966e00598a34e57',
debug: {
bytecode: '7c92007c63006576539f766b637853795395937b757c8b686c916675677853957768599c77',
sourceMap: '6:26:6:38;;7:20:7:21;8:12:8:19;:21:12:9;9:25:9:26;:12:11:13;:28:9:29;:32::33;:28:::1;;;:46:11:13:0;10:24:10:29;:39::40;;:32::41:1;;:24;:16::42;;;9:35:9:44;:46:11:13;;:12;;;12:15:14:9:0;13:27:13:28;:20::29:1;;:12::30;12:15:14:9;15:25:15:26:0;:8::28:1;6:40:16:5',
bytecode: '7c92007c63006576539f766b637c52795395937c8b686c916675677853957768599c77',
sourceMap: '6:26:6:38;;7:20:7:21;8:12:8:19;:21:12:9;9:25:9:26;:12:11:13;:28:9:29;:32::33;:28:::1;;;:46:11:13:0;10:24:10:29;:39::40;;:32::41:1;;:24;:16::42;9:39:9:44;:46:11:13;;:12;;;12:15:14:9:0;13:27:13:28;:20::29:1;;:12::30;12:15:14:9;15:25:15:26:0;:8::28:1;6:40:16:5',
logs: [],
requires: [{ ip: 36, line: 15 }],
sourceTags: '0:1:pv;22:22:fu;23:26:lc;27:27:sc;36:36:sc',
requires: [{ ip: 34, line: 15 }],
sourceTags: '0:1:pv;20:20:fu;21:24:lc;25:25:sc;34:34:sc',
functions: [
{
name: 'triple',
Expand All @@ -50,7 +50,7 @@ export const fixtures: Fixture[] = [
requires: [],
},
],
inlineRanges: '16:17:triple;30:31:triple',
inlineRanges: '16:17:triple;28:29:triple',
},
},
},
Expand Down
14 changes: 7 additions & 7 deletions packages/cashc/test/generation/fixtures/valid-contract-files/increment_decrement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ export const fixtures: Fixture[] = [
// require(x == 6);
+ 'OP_DUP OP_6 OP_NUMEQUALVERIFY '
// x--;
+ 'OP_DUP OP_1SUB '
+ 'OP_1SUB '
// require(x == 5);
+ 'OP_5 OP_NUMEQUAL '
// Cleanup
+ 'OP_NIP OP_NIP',
fingerprint: '5ccf48b6901709f59aaa5fab621021cf8598fb6fdd591f7f714902070c84bb85',
+ 'OP_NIP',
fingerprint: '142fea5495e16cd7fd687d05c5ab810d99db4dff3c1c200e3a16e457e1c135aa',
debug: {
bytecode: '55768b76569d768c559c7777',
sourceMap: '3:16:3:17;4:8:4:9;:::11:1;5:16:5:17:0;:21::22;:8::24:1;7::7:9:0;:::11:1;8:21:8:22:0;:8::24:1;2:21:9:5;',
bytecode: '55768b76569d8c559c77',
sourceMap: '3:16:3:17;4:8:4:9;:::11:1;5:16:5:17:0;:21::22;:8::24:1;7::7:11;8:21:8:22:0;:8::24:1;2:21:9:5',
logs: [],
requires: [{ ip: 5, line: 5 }, { ip: 10, line: 8 }],
sourceTags: '10:11:sc',
requires: [{ ip: 5, line: 5 }, { ip: 9, line: 8 }],
sourceTags: '9:9:sc',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cashc/test/generation/fixtures/valid-contract-files/sum_input_amount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const fixtures: Fixture[] = [
fingerprint: '46abccb7ef0a81c35e6f20ae62afd904d9e72e7bca703798a6726d7434ab7ad1',
debug: {
bytecode: '00006576c67b757c8b76c3a2667c02d007a077',
sourceMap: '3:18:3:19;4:16:4:17;6:8:9:39;7:28:7:29;:18::36:1;:12::37;;;8::8:22;9:17:9:18:0;:21::37;6:8::39:1;;12:16:12:19:0;:22::26;:8::28:1;2:22:13:5',
sourceMap: '3:18:3:19;4:16:4:17;6:8:9:39;7:28:7:29;:18::36:1;:12::37;;;8:16:8:21;9:17:9:18:0;:21::37;6:8::39:1;;12:16:12:19:0;:22::26;:8::28:1;2:22:13:5',
logs: [{ ip: 13, line: 11, data: [{ stackIndex: 1, type: 'int', ip: 13 }] }],
requires: [{ ip: 16, line: 12 }],
sourceTags: '16:16:sc',
Expand Down
15 changes: 7 additions & 8 deletions packages/cashc/test/generation/fixtures/valid-contract-files/tuple_modifiers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@ export const fixtures: Fixture[] = [
// if (acc > 0) {
+ 'OP_DUP OP_0 OP_GREATERTHAN OP_IF '
// (acc, int unused scratch) = pair(acc);
// the unused declaration is dropped instead of parked, then the reassignment
// value folds into acc's slot
+ 'OP_DUP OP_DUP OP_1ADD OP_SWAP OP_2 OP_MUL OP_DROP OP_NIP OP_ENDIF '
// the unused declaration is dropped instead of parked, and acc is updated in place
+ 'OP_DUP OP_1ADD OP_SWAP OP_2 OP_MUL OP_DROP OP_ENDIF '
// require(acc + doubled >= 0);
+ 'OP_ROT OP_ADD OP_0 OP_GREATERTHANOREQUAL OP_VERIFY '
// require(payload == 0x12);
+ '12 OP_EQUAL',
fingerprint: '77f06b3b6cfe6d5e97768ab4c1649870173bfaedd960771ceec13a89356867cb',
fingerprint: '934d6300e6c249103dcb66220304f897a237d14f5276448eaf41f6fe937d685b',
debug: {
bytecode: '76768b7c529577021234517f757b7600a06376768b7c52957577687b9300a269011287',
bytecode: '76768b7c529577021234517f757b7600a063768b7c529575687b9300a269011287',
sourceMap: '12:60:12:61;:55::62:1;;;;;:8::63;15:46:15:52:0;:59::60;:46::61:1;:8::62;19:18:19:19:0;'
+ '20:12:20:15;:18::19;:12:::1;:21:22:9:0;21:45:21:48;:40::49:1;;;;;:12::50;;20:21:22:9;'
+ '20:12:20:15;:18::19;:12:::1;:21:22:9:0;21:40:21:49:1;;;;;:12::50;20:21:22:9;'
+ '24:22:24:29:0;:16:::1;:33::34:0;:16:::1;:8::36;25:27:25:31:0;:8::33:1',
logs: [],
requires: [{ ip: 29, line: 24 }, { ip: 32, line: 25 }],
requires: [{ ip: 27, line: 24 }, { ip: 30, line: 25 }],
functions: [
{
name: 'pair',
Expand All @@ -43,7 +42,7 @@ export const fixtures: Fixture[] = [
requires: [],
},
],
inlineRanges: '1:5:pair;17:21:pair',
inlineRanges: '1:5:pair;16:20:pair',
},
},
},
Expand Down
Loading
Loading