Merging r333467:
    
    ------------------------------------------------------------------------
    r333467 | marshall | 2018-05-29 15:25:42 -0700 (Tue, 29 May 2018) | 1 line
    
    Fix embarrasing typo in uncaught_exceptions. Update tests to really test this. Thanks to Peter Klotz for calling my attention to this.
    ------------------------------------------------------------------------
    
    llvm-svn: 333910