commit 12ac9dbe6faf6de8ccf3fd06e1de5c24f0df9c8e
author swift-ci <swift-ci@users.noreply.github.com> Fri Oct 13 10:28:03 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Fri Oct 13 10:28:03 2017 -0700
tree 1176d33a6d71c43259d8099f29a5b3affec8f4b9
parent 6241e36ee5a6205f2887602d7829da35487ed291
parent 3e3c07968dd669600354971757c7c075bdef9e65

Merge remote-tracking branch 'origin/swift-4.1-branch' into stable

lib/Basic/SourceMgrAdapter.cpp

diff --git a/lib/Basic/SourceMgrAdapter.cpp b/lib/Basic/SourceMgrAdapter.cpp
index 1d52a24..c80112e 100644
--- a/lib/Basic/SourceMgrAdapter.cpp
+++ b/lib/Basic/SourceMgrAdapter.cpp
@@ -112,6 +112,9 @@
     diagID = WarningDiagID;
     break;
 
+  case llvm::SourceMgr::DK_Remark:
+    llvm_unreachable("remarks not implemented");
+
   case llvm::SourceMgr::DK_Note:
     diagID = NoteDiagID;
     break;

lib/CodeGen/CodeGenAction.cpp

diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp
index 4f03de5..db3d8d1 100644
--- a/lib/CodeGen/CodeGenAction.cpp
+++ b/lib/CodeGen/CodeGenAction.cpp
@@ -402,6 +402,8 @@
   case llvm::SourceMgr::DK_Note:
     DiagID = diag::note_fe_inline_asm;
     break;
+  case llvm::SourceMgr::DK_Remark:
+    llvm_unreachable("remarks unexpected");
   }
   // If this problem has clang-level source location information, report the
   // issue in the source with a note showing the instantiated
@@ -884,6 +886,8 @@
   case llvm::SourceMgr::DK_Note:
     DiagID = diag::note_fe_inline_asm;
     break;
+  case llvm::SourceMgr::DK_Remark:
+    llvm_unreachable("remarks unexpected");
   }
 
   Diags->Report(DiagID).AddString("cannot compile inline asm");