Fix mismerge by me.
Fix mismerge by me.

(cherry picked from commit 8b878c4f0194d1b2555ee0e4ee8ba341e3522bb3)

apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb