Re-land r228258 and make clang-cl's /EHs- disable -fexceptions again

After r228258, Clang started emitting C++ EH IR that LLVM wasn't ready
to deal with, even when exceptions were disabled with /EHs-. This time,
make /EHs- turn off -fexceptions while still emitting exceptional
constructs in functions using __try.  Since Sema rejects C++ exception
handling constructs before CodeGen, landingpads should only appear in
such functions as the result of a __try.

llvm-svn: 228329
diff --git a/clang/test/Driver/cl-eh.cpp b/clang/test/Driver/cl-eh.cpp
index c9cb903..a71491e 100644
--- a/clang/test/Driver/cl-eh.cpp
+++ b/clang/test/Driver/cl-eh.cpp
@@ -10,11 +10,11 @@
 
 // RUN: %clang_cl /c /EHs-c- -### -- %s 2>&1 | FileCheck -check-prefix=EHs_c_ %s
 // EHs_c_-NOT: "-fcxx-exceptions"
-// EHs_c_: "-fexceptions"
+// EHs_c_-NOT: "-fexceptions"
 
 // RUN: %clang_cl /c /EHs- /EHc- -### -- %s 2>&1 | FileCheck -check-prefix=EHs_EHc_ %s
 // EHs_EHc_-NOT: "-fcxx-exceptions"
-// EHs_EHc_: "-fexceptions"
+// EHs_EHc_-NOT: "-fexceptions"
 
 // RUN: %clang_cl /c /EHs- /EHs -### -- %s 2>&1 | FileCheck -check-prefix=EHs_EHs %s
 // EHs_EHs: "-fcxx-exceptions"