Merge pull request #6349 from booto/codehandler Update codehandler to stash registers that may get clobbered