It is currently possible to save Runtime, C1 and C2 generated stubs to the AOT code cache on architectures where AOT caching is supported and restore them in a production run (although this behaviour is currently disabled). This capability should be extended to include save and restore of Stub Generator (stubgen) stubs i.e. to include all stubs enumerated by stub declarations.
While doing so the opportunity should be taken to simplify the code that records stub entry and data addresses: in order to be able to relocate references from one stub to another when stubs are reloaded; and to prepare for relocating references from restored compiled Java methods.