diff --git a/lib/Target/NVPTX/NVPTXISelLowering.cpp b/lib/Target/NVPTX/NVPTXISelLowering.cpp
index 5f925ff..d326805 100644
--- a/lib/Target/NVPTX/NVPTXISelLowering.cpp
+++ b/lib/Target/NVPTX/NVPTXISelLowering.cpp
@@ -860,7 +860,7 @@
     return Op;
   case ISD::CONCAT_VECTORS: return LowerCONCAT_VECTORS(Op, DAG);
   default:
-    assert(0 && "Custom lowering not defined for operation");
+    llvm_unreachable("Custom lowering not defined for operation");
   }
 }
 
diff --git a/lib/Target/NVPTX/NVPTXutil.cpp b/lib/Target/NVPTX/NVPTXutil.cpp
index de311d2..6a0e532 100644
--- a/lib/Target/NVPTX/NVPTXutil.cpp
+++ b/lib/Target/NVPTX/NVPTXutil.cpp
@@ -75,6 +75,7 @@
 
   int retval = encode_leb128(temp64.x, &nbytes, encoded, 16);
 
+  (void)retval;
   assert(retval == 0 &&
          "Encoding to leb128 failed");