gh-91389: Fix show_caches in dis module #32406

15r10nk · 2022-04-07T20:40:00Z

https://bugs.python.org/issue47233

the-knights-who-say-ni · 2022-04-07T20:40:03Z

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@15r10nk

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

brandtbucher

Thanks! A few notes:

Please sign the CLA (you've probably seen the bot's message by now).
This needs a NEWS entry. Something simple like "Fix an issue where passing ``show_caches=True`` to :mod:`dis` utilities could result in incorrect position information." should be fine.
It also needs at least one regression test in Lib/test/test_dis.py that fails before this change and passes after.
You can also add your name to Misc/ACKS, if you want. 😎

Let me know if you have any questions.

Lib/dis.py

bedevere-bot · 2022-04-07T21:10:26Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

15r10nk · 2022-04-07T22:01:29Z

I have made the requested changes; please review again

bedevere-bot · 2022-04-07T22:01:32Z

Thanks for making the requested changes!

@brandtbucher: please review the changes made to this pull request.

15r10nk · 2022-04-08T14:20:08Z

Please don't merge. I want to improve the unit test.

15r10nk · 2022-04-10T21:09:29Z

I changed the unit test. What do you think @brandtbucher ?

brandtbucher

Almost there... just a couple of naming/formatting improvements:

brandtbucher · 2022-04-13T22:11:41Z

Lib/test/test_dis.py

+            if x:
+                c=5
+
+        def getInstructions(show_caches):


Suggested change

def getInstructions(show_caches):

def get_instructions(show_caches):

brandtbucher · 2022-04-13T22:12:05Z

Lib/test/test_dis.py

+                if instr.opname != "CACHE"
+            ]
+
+        self.assertEqual(getInstructions(True),getInstructions(False))


Suggested change

self.assertEqual(getInstructions(True),getInstructions(False))

self.assertEqual(get_instructions(True), get_instructions(False))

brandtbucher · 2022-04-13T22:12:28Z

Lib/test/test_dis.py

+            a.b.c(1*x)
+            if x:
+                c=5


Suggested change

a.b.c(1*x)

if x:

c=5

a.b.c(1 * x)

if x:

c = 5

bedevere-bot · 2022-04-13T22:15:18Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

cpython-cla-bot · 2022-04-14T07:22:28Z

The following commit authors need to sign the Contributor License Agreement:

[email protected]

Click the button to sign:

15r10nk · 2022-04-14T07:31:34Z

I have made the requested changes; please review again

bedevere-bot · 2022-04-14T07:31:37Z

Thanks for making the requested changes!

@brandtbucher: please review the changes made to this pull request.

ambv · 2022-04-14T15:59:14Z

@15r10nk, can you re-sign the CLA using your polarbit.de address? If the CLA bot doesn't let you, please add this email to your Github emails in settings. If you click on the list of commits in this PR now, you will see that the author of the commit is listed as "Frank Hoffmann" and doesn't link back to your profile.

brandtbucher · 2022-04-14T16:29:20Z

Lib/dis.py

@@ -413,6 +413,9 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
            labels.add(target)
    starts_line = None
    for offset, op, arg in _unpack_opargs(code):
+        # get the next position before we skip a CACHE instruction
+        # to associate the correct position information. 


Also, the CI is mad about this trailing whitespace. Didn't see it until now:

Suggested change

# to associate the correct position information.

# to associate the correct position information.

15r10nk · 2022-04-14T19:16:49Z

Yes, I will do, unfortunately not before next week Wednesday.

15r10nk · 2022-04-20T19:37:50Z

It seems that I was to late :-).
The problem was fixed with e590379.

bedevere-bot added the awaiting review label Apr 7, 2022

the-knights-who-say-ni added the CLA not signed label Apr 7, 2022

brandtbucher self-requested a review April 7, 2022 21:01

brandtbucher requested changes Apr 7, 2022

View reviewed changes

Lib/dis.py Show resolved Hide resolved

bedevere-bot added awaiting changes and removed awaiting review labels Apr 7, 2022

15r10nk force-pushed the fix-issue-47233 branch from 2f30bd2 to 9e37f18 Compare April 7, 2022 21:57

the-knights-who-say-ni added CLA signed and removed CLA not signed labels Apr 7, 2022

bedevere-bot added awaiting change review and removed awaiting changes labels Apr 7, 2022

bedevere-bot requested a review from brandtbucher April 7, 2022 22:01

15r10nk force-pushed the fix-issue-47233 branch 2 times, most recently from 963afcc to 3fd5c3e Compare April 8, 2022 19:35

brandtbucher requested changes Apr 13, 2022

View reviewed changes

bedevere-bot added awaiting changes and removed awaiting change review labels Apr 13, 2022

bpo-47233: Fix show_caches in dis module

82e0ecb

15r10nk force-pushed the fix-issue-47233 branch from 3fd5c3e to 82e0ecb Compare April 14, 2022 07:22

bedevere-bot added awaiting change review and removed awaiting changes labels Apr 14, 2022

bedevere-bot requested a review from brandtbucher April 14, 2022 07:31

brandtbucher changed the title ~~bpo-47233: Fix show_caches in dis module~~ gh-91389: Fix show_caches in dis module Apr 14, 2022

ambv removed the CLA signed label Apr 14, 2022

brandtbucher reviewed Apr 14, 2022

View reviewed changes

ambv closed this Apr 15, 2022

ambv reopened this Apr 15, 2022

ambv closed this Apr 15, 2022

ambv reopened this Apr 15, 2022

ambv closed this Apr 15, 2022

ambv reopened this Apr 15, 2022

15r10nk mannequin mentioned this pull request Apr 20, 2022

show_caches option affects code positions reported by dis.get_instructions(...) #91389

Closed

15r10nk closed this May 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gh-91389: Fix show_caches in dis module #32406

gh-91389: Fix show_caches in dis module #32406

15r10nk commented Apr 7, 2022 •

edited by bedevere-bot

Loading

the-knights-who-say-ni commented Apr 7, 2022

brandtbucher left a comment

bedevere-bot commented Apr 7, 2022

15r10nk commented Apr 7, 2022

bedevere-bot commented Apr 7, 2022

15r10nk commented Apr 8, 2022

15r10nk commented Apr 10, 2022

brandtbucher left a comment

brandtbucher Apr 13, 2022

brandtbucher Apr 13, 2022

brandtbucher Apr 13, 2022

bedevere-bot commented Apr 13, 2022

cpython-cla-bot bot commented Apr 14, 2022 •

edited

Loading

15r10nk commented Apr 14, 2022

bedevere-bot commented Apr 14, 2022

ambv commented Apr 14, 2022

brandtbucher Apr 14, 2022

15r10nk commented Apr 14, 2022

15r10nk commented Apr 20, 2022

	def getInstructions(show_caches):
	def get_instructions(show_caches):

	self.assertEqual(getInstructions(True),getInstructions(False))
	self.assertEqual(get_instructions(True), get_instructions(False))

	# to associate the correct position information.
	# to associate the correct position information.

gh-91389: Fix show_caches in dis module #32406

gh-91389: Fix show_caches in dis module #32406

Conversation

15r10nk commented Apr 7, 2022 • edited by bedevere-bot Loading

the-knights-who-say-ni commented Apr 7, 2022

CLA Missing

brandtbucher left a comment

Choose a reason for hiding this comment

bedevere-bot commented Apr 7, 2022

15r10nk commented Apr 7, 2022

bedevere-bot commented Apr 7, 2022

15r10nk commented Apr 8, 2022

15r10nk commented Apr 10, 2022

brandtbucher left a comment

Choose a reason for hiding this comment

brandtbucher Apr 13, 2022

Choose a reason for hiding this comment

brandtbucher Apr 13, 2022

Choose a reason for hiding this comment

brandtbucher Apr 13, 2022

Choose a reason for hiding this comment

bedevere-bot commented Apr 13, 2022

cpython-cla-bot bot commented Apr 14, 2022 • edited Loading

15r10nk commented Apr 14, 2022

bedevere-bot commented Apr 14, 2022

ambv commented Apr 14, 2022

brandtbucher Apr 14, 2022

Choose a reason for hiding this comment

15r10nk commented Apr 14, 2022

15r10nk commented Apr 20, 2022

15r10nk commented Apr 7, 2022 •

edited by bedevere-bot

Loading

cpython-cla-bot bot commented Apr 14, 2022 •

edited

Loading