Merge the code generator miscompilation code into the optimizer miscompilation