Iain, could you let me know if the attached patch fixes your problem? The patch changes gimple_call_set_cannot_inline to update the corresponding callgraph edge, if needed. I did not touch any of the other calls, because sometimes we are calling this function in IPA mode, and so we don't know what function the call belongs to.
I've tested it on x86_64. I will be committing it shortly. Thanks. Diego.
00.diff
Description: Binary data
