update clang tests

Author: sivadeilra

clang/test/CodeGenCXX/microsoft-abi-eh-async.cpp

@@ -105,7 +105,6 @@ void case_except_simple_call() NO_TAIL
 // CHECK-LABEL: .def "?case_except_simple_call@@YAXXZ"
 // CHECK: .seh_endprologue
 // CHECK-NEXT: call "?does_not_throw@@YAXXZ"
-// CHECK-NEXT: nop
 // CHECK-NEXT: .seh_startepilogue
 // CHECK: .seh_endproc
 
@@ -116,7 +115,6 @@ void case_noexcept_simple_call() noexcept(true) NO_TAIL
 // CHECK-LABEL: .def "?case_noexcept_simple_call@@YAXXZ"
 // CHECK: .seh_endprologue
 // CHECK-NEXT: call "?does_not_throw@@YAXXZ"
-// CHECK-NEXT: nop
 // CHECK-NEXT: .seh_startepilogue
 // CHECK: .seh_endepilogue
 // CHECK-NEXT: ret

clang/test/CodeGenCXX/microsoft-abi-eh-ip2state.cpp

@@ -16,6 +16,14 @@ void does_not_throw() noexcept(true);
 
 extern "C" void __declspec(dllimport) some_dll_import();
 
+class __declspec(dllimport) FromDll {
+    int x;
+
+    public:
+        FromDll(int x);
+        ~FromDll();
+};
+
 class HasDtor {
     int x;
     char foo[40];
@@ -33,13 +41,19 @@ class BadError {
 // Verify that when NOP padding for IP2State is active *and* Import Call
 // Optimization is active that we see both forms of NOP padding.
 void case_calls_dll_import() NO_TAIL {
-    some_dll_import();
+    FromDll fromDll(10);
+    might_throw();
 }
 // CHECK-LABEL: .def "?case_calls_dll_import@@YAXXZ"
 // CHECK: .seh_endprologue
 // CHECK: .Limpcall{{[0-9]+}}:
-// CHECK-NEXT: rex64
-// CHECK-NEXT: call __imp_some_dll_import
+// CHECK: rex64
+// CHECK-NEXT: call "__imp_??0FromDll@@QEAA@H@Z"
+// CHECK-NEXT: nop dword ptr {{\[.*\]}}
+// CHECK-NEXT: nop
+// CHECK: call "?might_throw@@YAXXZ"
+// CHECK: rex64
+// CHECK-NEXT:  call "__imp_??1FromDll@@QEAA@XZ"
 // CHECK-NEXT: nop dword ptr {{\[.*\]}}
 // CHECK-NEXT: nop
 // CHECK-NEXT: .seh_startepilogue
@@ -118,7 +132,6 @@ void case_except_simple_call() NO_TAIL
 // CHECK-LABEL: .def "?case_except_simple_call@@YAXXZ"
 // CHECK: .seh_endprologue
 // CHECK-NEXT: call "?might_throw@@YAXXZ"
-// CHECK-NEXT: nop
 // CHECK-NEXT: .seh_startepilogue
 
 // Simple call of a function that cannot throw, in a noexcept context.
@@ -129,7 +142,6 @@ void case_noexcept_simple_call() noexcept(true) NO_TAIL
 // CHECK-LABEL: .def "?case_noexcept_simple_call@@YAXXZ"
 // CHECK: .seh_endprologue
 // CHECK-NEXT: call "?does_not_throw@@YAXXZ"
-// CHECK-NEXT: nop
 // CHECK-NEXT: .seh_startepilogue
 
 
@@ -182,30 +194,6 @@ void case_dtor_runs_after_join(int x) {
 }
 
 
-// Check the behavior of NOP padding around tail calls.
-// We do not expect to insert NOPs around tail calls.
-// However, the first call (to other_func()) does get a NOP
-// because it comes before .seh_startepilogue.
-void case_tail_call_no_eh() {
-    // CHECK-LABEL: .def "?case_tail_call_no_eh@@YAXXZ"
-    // CHECK: .seh_endprologue
-
-    // ordinary call
-    other_func(10);
-    // CHECK: call "?other_func@@YAXH@Z"
-    // CHECK-NEXT: nop
-
-    // tail call; no NOP padding after JMP
-    does_not_throw();
-
-    // CHECK: .seh_startepilogue
-    // CHECK: .seh_endepilogue
-    // CHECK: jmp "?does_not_throw@@YAXXZ"
-    // CHECK-NOT: nop
-    // CHECK: .seh_endproc
-}
-
-
 // Check the behavior of a try/catch
 int case_try_catch() {
     // CHECK-LABEL: .def "?case_try_catch@@YAHXZ"