Merge branch 'master' into feature-832-custom-rust-target

Author: tmfink

.travis.yml

@@ -30,6 +30,7 @@ matrix:
 cache:
   directories:
     - $HOME/.cargo
+    - $HOME/.llvm-builds
 
 before_install: . ./ci/before_install.sh
 

ci/before_install.sh

@@ -6,25 +6,31 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     rvm get head || true
 fi
 
-function llvm_download() {
+function llvm_download_if_needed() {
     export LLVM_VERSION_TRIPLE="${LLVM_VERSION}"
     export LLVM=clang+llvm-${LLVM_VERSION_TRIPLE}-x86_64-$1
 
-    wget http://llvm.org/releases/${LLVM_VERSION_TRIPLE}/${LLVM}.tar.xz
-    mkdir llvm
-    tar -xf ${LLVM}.tar.xz -C llvm --strip-components=1
+    local llvm_build_dir="$HOME/.llvm-builds/${LLVM}"
 
-    export LLVM_CONFIG_PATH=`pwd`/llvm/bin/llvm-config
+    if [ -d "${llvm_build_dir}" ]; then
+        echo "Using cached LLVM build for ${LLVM} in ${llvm_build_dir}";
+    else
+        wget http://llvm.org/releases/${LLVM_VERSION_TRIPLE}/${LLVM}.tar.xz
+        mkdir -p "${llvm_build_dir}"
+        tar -xf ${LLVM}.tar.xz -C "${llvm_build_dir}" --strip-components=1
+    fi
+
+    export LLVM_CONFIG_PATH="${llvm_build_dir}/bin/llvm-config"
     if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-        cp llvm/lib/libclang.dylib /usr/local/lib/libclang.dylib
+        cp "${llvm_build_dir}/lib/libclang.dylib" /usr/local/lib/libclang.dylib
     fi
 }
 
 
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-    llvm_download linux-gnu-ubuntu-14.04
+    llvm_download_if_needed linux-gnu-ubuntu-14.04
 else
-    llvm_download apple-darwin
+    llvm_download_if_needed apple-darwin
 fi
 
 popd

src/codegen/mod.rs

@@ -13,7 +13,7 @@ use ir::comp::{Base, BitfieldUnit, Bitfield, CompInfo, CompKind, Field,
                FieldData, FieldMethods, Method, MethodKind};
 use ir::comment;
 use ir::context::{BindgenContext, ItemId};
-use ir::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault};
+use ir::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault, CanDeriveHash};
 use ir::dot;
 use ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
 use ir::function::{Abi, Function, FunctionSig};
@@ -1440,6 +1440,10 @@ impl CodeGenerator for CompInfo {
             }
         }
 
+        if item.can_derive_hash(ctx) {
+            derives.push("Hash");
+        }
+
         if !derives.is_empty() {
             attributes.push(attributes::derives(&derives))
         }
@@ -3394,12 +3398,23 @@ mod utils {
         )
             .unwrap();
 
+        // The actual memory of the filed will be hashed, so that's why these
+        // field doesn't do anything with the hash.
+        let union_field_hash_impl = quote_item!(&ctx.ext_cx(),
+            impl<T> ::$prefix::hash::Hash for __BindgenUnionField<T> {
+                fn hash<H: ::$prefix::hash::Hasher>(&self, _state: &mut H) {
+                }
+            }
+        )
+            .unwrap();
+
         let items = vec![union_field_decl,
                          union_field_impl,
                          union_field_default_impl,
                          union_field_clone_impl,
                          union_field_copy_impl,
-                         union_field_debug_impl];
+                         union_field_debug_impl,
+                         union_field_hash_impl];
 
         let old_items = mem::replace(result, items);
         result.extend(old_items.into_iter());