fix: use read location for variable source locations, rather than whe…

…re the variable was last defined
algorandfoundation · Nov 7, 2024 · 27e2659 · 27e2659
1 parent dac51be
commit 27e2659
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 253 deletions.
diff --git a/examples/amm/out_unoptimized/ConstantProductAMM.approval.teal b/examples/amm/out_unoptimized/ConstantProductAMM.approval.teal
@@ -588,10 +588,14 @@ do_asset_transfer:
     //     asset_receiver=receiver,
     // ).submit()
     itxn_begin
-    // amm/contract.py:357
-    // def do_asset_transfer(*, receiver: Account, asset: Asset, amount: UInt64) -> None:
+    // amm/contract.py:359
+    // xfer_asset=asset,
     frame_dig -2
+    // amm/contract.py:360
+    // asset_amount=amount,
     frame_dig -1
+    // amm/contract.py:361
+    // asset_receiver=receiver,
     frame_dig -3
     itxn_field AssetReceiver
     itxn_field AssetAmount

diff --git a/examples/auction/out_unoptimized/Auction.approval.teal b/examples/auction/out_unoptimized/Auction.approval.teal
@@ -270,8 +270,8 @@ opt_into_asset:
     // auction/contract.py:36
     // asset_receiver=Global.current_application_address,
     global CurrentApplicationAddress
-    // auction/contract.py:26
-    // def opt_into_asset(self, asset: Asset) -> None:
+    // auction/contract.py:37
+    // xfer_asset=asset,
     frame_dig -1
     itxn_field XferAsset
     itxn_field AssetReceiver
@@ -525,8 +525,8 @@ claim_asset:
     //     asset_amount=self.asa_amount,
     // ).submit()
     itxn_begin
-    // auction/contract.py:98
-    // def claim_asset(self, asset: Asset) -> None:
+    // auction/contract.py:102
+    // xfer_asset=asset,
     frame_dig -1
     // auction/contract.py:103
     // asset_close_to=self.previous_bidder,

diff --git a/examples/voting/out_unoptimized/VotingRoundApp.approval.teal b/examples/voting/out_unoptimized/VotingRoundApp.approval.teal
@@ -808,8 +808,8 @@ close_after_for@14:
     bytec 13 // "nft_image_url"
     app_global_get_ex
     assert // check self.nft_image_url exists
-    // voting/voting.py:144
-    // note += "]}}"
+    // voting/voting.py:153
+    // note=note,
     uncover 2
     itxn_field Note
     itxn_field ConfigAssetURL

diff --git a/src/puya/ir/builder/main.py b/src/puya/ir/builder/main.py
@@ -470,6 +470,7 @@ def visit_var_expression(self, expr: awst_nodes.VarExpression) -> TExpression:
         variable = self.context.ssa.read_variable(
             expr.name, ir_type, self.context.block_builder.active_block
         )
+        variable = attrs.evolve(variable, source_location=expr.source_location)
         return variable
 
     def visit_intrinsic_call(self, call: awst_nodes.IntrinsicCall) -> TExpression:

diff --git a/test_cases/compile/out_unoptimized/HelloFactory.approval.teal b/test_cases/compile/out_unoptimized/HelloFactory.approval.teal
@@ -370,8 +370,8 @@ test_compile_contract:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:35
-    // hello_app = (
+    // compile/factory.py:49
+    // app_id=hello_app,
     swap
     itxn_field ApplicationID
     // compile/factory.py:48
@@ -550,8 +550,8 @@ test_compile_contract_tmpl:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:67
-    // hello_app = (
+    // compile/factory.py:84
+    // app_id=hello_app,
     swap
     itxn_field ApplicationID
     // compile/factory.py:83
@@ -715,8 +715,8 @@ test_compile_contract_prfx:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:103
-    // hello_app = (
+    // compile/factory.py:117
+    // app_id=hello_app,
     swap
     itxn_field ApplicationID
     // compile/factory.py:116
@@ -992,14 +992,8 @@ test_arc4_create:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:163-164
-    // # create app
-    // hello_app = arc4.arc4_create(Hello.create, "hello").created_app
     swap
     itxn_field ApplicationID
-    // compile/factory.py:166-167
-    // # call the new app
-    // result, _txn = arc4.abi_call(Hello.greet, "world", app_id=hello_app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1101,13 +1095,8 @@ test_arc4_create_tmpl:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:182
-    // hello_app = arc4.arc4_create(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:187-188
-    // # call the new app
-    // result, _txn = arc4.abi_call(HelloTmpl.greet, "world", app_id=hello_app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1211,13 +1200,8 @@ test_arc4_create_prfx:
     extract 6 2
     bytec_3 // "world"
     concat
-    // compile/factory.py:205
-    // hello_app = arc4.arc4_create(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:210-211
-    // # call the new app
-    // result, _txn = arc4.abi_call(HelloPrfx.greet, "world", app_id=hello_app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1448,12 +1432,8 @@ test_arc4_create_modified_compiled:
     extract 6 2
     bytec 6 // "there"
     concat
-    // compile/factory.py:246
-    // app = arc4.arc4_create(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:257
-    // result, _txn = arc4.abi_call(Hello.greet, "there", app_id=app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1589,14 +1569,8 @@ test_arc4_update:
     extract 6 2
     bytec 6 // "there"
     concat
-    // compile/factory.py:266-267
-    // # create app
-    // app = arc4.arc4_create(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:280-281
-    // # call the new app
-    // result, _txn = arc4.abi_call(HelloTmpl.greet, "there", app_id=app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1623,13 +1597,7 @@ test_arc4_update:
     // # update the app
     // arc4.arc4_update(Hello, app_id=app)
     itxn_begin
-    // compile/factory.py:266-267
-    // # create app
-    // app = arc4.arc4_create(
     frame_dig 0
-    // compile/factory.py:284-285
-    // # update the app
-    // arc4.arc4_update(Hello, app_id=app)
     bytec_2 // base64(CoEBQw==)
     itxn_field ClearStateProgramPages
     bytec_0 // 0x
@@ -1656,14 +1624,8 @@ test_arc4_update:
     extract 6 2
     bytec 6 // "there"
     concat
-    // compile/factory.py:266-267
-    // # create app
-    // app = arc4.arc4_create(
     frame_dig 0
     itxn_field ApplicationID
-    // compile/factory.py:287-288
-    // # call the updated app
-    // result, _txn = arc4.abi_call(Hello.greet, "there", app_id=app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1694,9 +1656,8 @@ test_arc4_update:
     //     # on_complete is inferred from Hello.delete ARC4 definition
     // )
     itxn_begin
-    // compile/factory.py:266-267
-    // # create app
-    // app = arc4.arc4_create(
+    // compile/factory.py:294
+    // app_id=app,
     frame_dig 0
     // compile/factory.py:291-296
     // # delete the app
@@ -1805,12 +1766,8 @@ test_other_constants:
     extract 6 2
     bytec 21 // "Johnny"
     concat
-    // compile/factory.py:300
-    // app = arc4.arc4_create(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:315
-    // result, _txn = arc4.abi_call(HelloOtherConstants.greet, "Johnny", app_id=app)
     pushbytes 0x5b0c2375 // method "greet(string)byte[]"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs
@@ -1940,12 +1897,8 @@ test_abi_call_create_params:
     extract 6 2
     bytec 6 // "there"
     concat
-    // compile/factory.py:327
-    // app = arc4.abi_call(
     swap
     itxn_field ApplicationID
-    // compile/factory.py:339
-    // result, _txn = arc4.abi_call(Hello.greet, "there", app_id=app)
     bytec 5 // method "greet(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs

diff --git a/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.approval.teal b/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.approval.teal
@@ -154,9 +154,8 @@ create_and_transfer:
     // inner_transactions/asset_transfer.py:30
     // asset_receiver=Global.current_application_address,
     global CurrentApplicationAddress
-    // inner_transactions/asset_transfer.py:13-14
-    // # create
-    // new_asset = (
+    // inner_transactions/asset_transfer.py:32
+    // xfer_asset=new_asset,
     swap
     itxn_field XferAsset
     // inner_transactions/asset_transfer.py:31

diff --git a/test_cases/inner_transactions/out_unoptimized/Greeter.approval.teal b/test_cases/inner_transactions/out_unoptimized/Greeter.approval.teal
@@ -202,11 +202,9 @@ log_greetings:
     bytec_0 // "hello_app"
     app_global_get_ex
     assert // check self.hello_app exists
-    // inner_transactions/c2c.py:24
-    // def log_greetings(self, name: arc4.String) -> None:
-    frame_dig -1
     // inner_transactions/c2c.py:27
     // app_args=(arc4.arc4_signature("hello(string)string"), name),
+    frame_dig -1
     pushbytes 0x02bece11 // method "hello(string)string"
     itxn_field ApplicationArgs
     itxn_field ApplicationArgs

diff --git a/test_cases/inner_transactions/out_unoptimized/MyContract.approval.teal b/test_cases/inner_transactions/out_unoptimized/MyContract.approval.teal
@@ -1148,8 +1148,8 @@ test4:
     //     + Bytes(b"\x48")  # pop
     // )
     dupn 3
-    // inner_transactions/contract.py:230
-    // approval_2 = (
+    // inner_transactions/contract.py:239
+    // approval_program=(approval_1, approval_2, approval_2, approval_2),
     cover 2
     cover 2
     // inner_transactions/contract.py:245

diff --git a/test_cases/inner_transactions/out_unoptimized/itxn_loop.approval.teal b/test_cases/inner_transactions/out_unoptimized/itxn_loop.approval.teal
@@ -60,25 +60,21 @@ main_for_header@1:
     b main_switch_case_default@6
 
 main_switch_case_0@3:
-    // inner_transactions/itxn_loop.py:28
-    // i_note = op.extract(note, 0, i)
-    dig 3
-    bury 3
     // inner_transactions/itxn_loop.py:31
     // app_params.set(note=i_note, app_args=(Bytes(b"1"),))
+    dig 3
+    bury 3
     bytec_0 // 0x31
     bury 7
     intc_0 // 1
     bury 2
     b main_switch_case_next@7
 
 main_switch_case_1@4:
-    // inner_transactions/itxn_loop.py:28
-    // i_note = op.extract(note, 0, i)
-    dig 3
-    bury 3
     // inner_transactions/itxn_loop.py:33
     // app_params.set(note=i_note, app_args=(Bytes(b"2"), Bytes(b"1")))
+    dig 3
+    bury 3
     bytec_1 // 0x32
     bury 7
     bytec_0 // 0x31
@@ -88,8 +84,8 @@ main_switch_case_1@4:
     b main_switch_case_next@7
 
 main_switch_case_2@5:
-    // inner_transactions/itxn_loop.py:28
-    // i_note = op.extract(note, 0, i)
+    // inner_transactions/itxn_loop.py:36
+    // note=i_note,
     dig 3
     bury 3
     // inner_transactions/itxn_loop.py:37