  
    def error_inoutput_conflict_with_clobber : Error<
 diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
-index f6eee838..669cabb9 100644
+index f6eee838..e5ed2c3f 100644
 --- a/include/clang/Sema/Sema.h
 +++ b/include/clang/Sema/Sema.h
 @@ -3935,6 +3935,7 @@ public:

                              SourceLocation RParenLoc);
 
   void FillInlineAsmIdentifierInfo(Expr *Res,
@@ -10215,9 +10216,8 @@ public:
                                                const T &Value) {
       if (Diag.ImmediateDiag.hasValue())
         *Diag.ImmediateDiag << Value;

   }
 }
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index da87e156..bb1e2642 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -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.");
