Way long time ago (1.5.2 timeframe), I worked on a register-based virtual machine for Python. Since then, at least Victor Stinner has made another (nearly complete) run at it. Since retirement, I find myself with more free time to mess around with Python. I went ahead and decided to try again.
The biggest change which impacts my relationship to CPython master is that I have squished out all the gaps in the the existing stack-based opcodes to make room for me to simply tack on my register instructions. So far so good.
In the past day or two, bpo-38091 landed on master, which involved a change to Lib/importlib/_bootstrap.py. That, in turn, resulted in changes to Python/importlib.h. When I merged master to my branch this morning, that generated a conflict.
No problem. I reran
make regen-all and all was good. My question is… Going forward, will I have to go through this dance every time I merge from master to my register branch, or is git somehow smart enough to not register another conflict unless Python/importlib.h (or other embedded bytecode) changes?