about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-09 17:08:13 +0000
committerbors <bors@rust-lang.org>2017-08-09 17:08:13 +0000
commit33d71944cd359db9d90718abe37559d419070eb9 (patch)
tree9a2e2c0b19878d188b6d6a225f88a01412f2d437
parentb2bf1639ac88afd4c163aac99cfdf6d6816e3c7d (diff)
parent15e8b0fd3decd6c3ceca1986a422ac5a8fc640f2 (diff)
Auto merge of #43732 - kennytm:pass-wrapper-warning, r=arielb1
Fix covered-switch-default warnings in PassWrapper

(See #39063 for explanation)
-rw-r--r--src/rustllvm/PassWrapper.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
index bca0881c08c..ba0c4fbe173 100644
--- a/src/rustllvm/PassWrapper.cpp
+++ b/src/rustllvm/PassWrapper.cpp
@@ -278,10 +278,12 @@ static Optional<Reloc::Model> fromRust(LLVMRustRelocMode RustReloc) {
     return Reloc::RWPI;
   case LLVMRustRelocMode::ROPIRWPI:
     return Reloc::ROPI_RWPI;
-#endif
+#else
   default:
-    llvm_unreachable("Bad RelocModel.");
+    break;
+#endif
   }
+  llvm_unreachable("Bad RelocModel.");
 }
 
 #if LLVM_RUSTLLVM