It's probably worth noting that the likely diffs involved can be inferred from the "upstream-with-swift" branch at "git at github.com:apple/swift-llvm.git", which is a fairly regularly merged copy of trunk with the swift changes. I'm steering well clear of the policy decision. Tim.