diff --git a/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll b/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll
index f640b9e..a3725f2 100644
--- a/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll
+++ b/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll
@@ -5,17 +5,22 @@
 ; bar.  However, the frame teardown and the return do not count towards the
 ; stackmap shadow as the call return counts as a branch target so must flush
 ; the shadow.
+; Note that in order for a thread to not return in to the patched space
+; the call must be at the end of the shadow, so the required nop must be
+; before the call, not after.
 define void @shadow_optimization_test() {
 entry:
 ; CHECK-LABEL:  shadow_optimization_test:
 ; CHECK:        callq   _bar
+; CHECK:        nop
+; CHECK:        callq   _bar
 ; CHECK-NOT:    nop
 ; CHECK:        callq   _bar
-; CHECK:        nop
-; CHECK:        retq
+; CHECK-NOT:    nop
   call void @bar()
   tail call void (i64, i32, ...)* @llvm.experimental.stackmap(i64 0, i32 8)
   call void @bar()
+  call void @bar()
   ret void
 }