better error message when using NULL in to_ptr

e3b4f8e6 · Ralf Jung · 0b8c691f · e3b4f8e6
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

src/librustc/mir/interpret/value.rs src/librustc/mir/interpret/value.rs +2 -1

未找到文件。
--- a/src/librustc/mir/interpret/value.rs
+++ b/src/librustc/mir/interpret/value.rs
@@ -148,7 +148,8 @@ pub fn to_bits(self, target_size: Size) -> EvalResult<'tcx, u128> {

    pub fn to_ptr(self) -> EvalResult<'tcx, Pointer> {
        match self {
-            Scalar::Bits {..} => err!(ReadBytesAsPointer),
+            Scalar::Bits { bits: 0, .. } => err!(InvalidNullPointerUsage),
+            Scalar::Bits { .. } => err!(ReadBytesAsPointer),
            Scalar::Ptr(p) => Ok(p),
        }
    }