Merge "Workaround the GCC "(long)fn -> lfn" optimization bug."