    }
  }
 diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
-index da87e156..adb8c9b0 100644
+index da87e156..bb1e2642 100644
 --- a/lib/Sema/Sema.cpp
 +++ b/lib/Sema/Sema.cpp
-@@ -1402,9 +1402,7 @@ Sema::DeviceDiagBuilder::DeviceDiagBuilder(Kind K, SourceLocation Loc,
+@@ -1402,23 +1402,11 @@ Sema::DeviceDiagBuilder::DeviceDiagBuilder(Kind K, SourceLocation Loc,
      break;
    case K_Deferred:
      assert(Fn && "Must have a function to attach the deferred diag to.");

-// expected-note@78 {{called by 'm'}}
-// expected-note@79 {{called by 'm'}}
-#endif

+  asm goto("testl %0, %0; jne %l1;" :: "r"(cond)::label_true);
+label_true:
   return;
 }
 
diff --git a/test/OpenMP/target_vla_messages.cpp b/test/OpenMP/target_vla_messages.cpp
index 30a27517..b744081e 100644
--- a/test/OpenMP/target_vla_messages.cpp
+++ b/test/OpenMP/target_vla_messages.cpp
@@ -47,7 +47,7 @@ void target_template(int arg) {
 #pragma omp target
   {
 #ifdef NO_VLA
-    // expected-error@+2 2 {{variable length arrays are not supported for the current target}}
+    // expected-error@+2 {{variable length arrays are not supported for the current target}}
 #endif
     T vla[arg];
   }
@@ -73,9 +73,6 @@ void target(int arg) {
     }
   }
 
-#ifdef NO_VLA
-    // expected-note@+2 {{in instantiation of function template specialization 'target_template<long>' requested here}}
-#endif
   target_template<long>(arg);
 }
 
diff --git a/test/PCH/asm.h b/test/PCH/asm.h
