Auto merge of #43732 - kennytm:pass-wrapper-warning, r=arielb1

bors · bors · commit 33d71944cd35 · 2017-08-09T17:08:13.000Z
Fix covered-switch-default warnings in PassWrapper (See #39063 for explanation)
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -278,10 +278,12 @@ static Optional<Reloc::Model> fromRust(LLVMRustRelocMode RustReloc) {`
`278`	`278`	`return Reloc::RWPI;`
`279`	`279`	`case LLVMRustRelocMode::ROPIRWPI:`
`280`	`280`	`return Reloc::ROPI_RWPI;`
`281`		`-#endif`
	`281`	`+#else`
`282`	`282`	`default:`
`283`		`- llvm_unreachable("Bad RelocModel.");`
	`283`	`+ break;`
	`284`	`+#endif`
`284`	`285`	`}`
	`286`	`+ llvm_unreachable("Bad RelocModel.");`
`285`	`287`	`}`
`286`	`288`
`287`	`289`	`#if LLVM_RUSTLLVM`