Ensure that all values in FnAttribute::NonNull are positive

Author: GuillaumeGomez

gccjit_sys/src/lib.rs

@@ -1,7 +1,6 @@
 #![allow(non_camel_case_types)]
 
-// Re-export libc to use the same version in `gccjit-rs`.
-pub extern crate libc;
+extern crate libc;
 
 use libc::{c_char, c_int, FILE, c_void, c_long, c_double, c_ulong, size_t, ssize_t};
 

src/function.rs

@@ -3,7 +3,6 @@ use std::fmt;
 use std::ptr;
 
 use gccjit_sys;
-use gccjit_sys::libc::c_int;
 
 use block::Block;
 use block;
@@ -62,7 +61,7 @@ pub enum FnAttribute<'a> {
     Pure,
     Const,
     Weak,
-    NonNull(Vec<c_int>),
+    NonNull(Vec<std::ffi::c_int>),
 }
 
 #[cfg(feature="master")]
@@ -80,7 +79,13 @@ impl<'a> FnAttribute<'a> {
             | FnAttribute::Pure
             | FnAttribute::Const
             | FnAttribute::Weak => AttributeValue::None,
-            FnAttribute::NonNull(ref value) => AttributeValue::IntArray(value),
+            FnAttribute::NonNull(ref value) => {
+                debug_assert!(
+                    value.iter().all(|attr| *attr > 0),
+                    "all values must be > 0 for non-null attribute",
+                );
+                AttributeValue::IntArray(value)
+            }
         }
     }
 

src/lvalue.rs

@@ -12,8 +12,6 @@ use field;
 use location::Location;
 use location;
 
-use gccjit_sys::libc::c_int;
-
 #[cfg(feature="master")]
 #[derive(Clone, Copy, Debug)]
 pub enum Visibility {
@@ -41,7 +39,7 @@ pub enum AttributeValue<'a> {
     Int(i32),
     None,
     String(&'a str),
-    IntArray(&'a [c_int]),
+    IntArray(&'a [std::ffi::c_int]),
 }
 
 #[cfg(feature="master")]