Fix the cherry pick of 6514935881a04cddd94f020ebc560a7abbd373c9.
Fix the cherry pick of 6514935881a04cddd94f020ebc560a7abbd373c9.

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