Merge pull request #56 from rustwasm/no-llvm-intrinsic

No llvm intrinsic

Author: fitzgen

.travis.yml

@@ -13,8 +13,10 @@ env:
 before_script:
   - rustup target add wasm32-unknown-unknown
   - rustup target add i686-pc-windows-gnu
-  - which wasm-gc || cargo install --git https://github.com/alexcrichton/wasm-gc
-  - which cargo-readme || cargo install cargo-readme
+  - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
+  - (test -x $HOME/.cargo/bin/cargo-readme || cargo install --vers "^3" cargo-readme)
+  - (test -x $HOME/.cargo/bin/wasm-gc || cargo install --vers "^0.1.6" wasm-gc)
+  - cargo install-update -a
 
 script:
   - "$SCRIPT"

wee_alloc/src/imp_wasm32.rs

@@ -1,17 +1,13 @@
 use super::{assert_is_word_aligned, PAGE_SIZE, unchecked_unwrap};
 use const_init::ConstInit;
 use core::alloc::AllocErr;
+use core::arch::wasm32;
 use core::cell::UnsafeCell;
 use core::ptr::NonNull;
 use memory_units::Pages;
 
-extern "C" {
-    #[link_name = "llvm.wasm.grow.memory.i32"]
-    fn grow_memory(pages: usize) -> i32;
-}
-
 pub(crate) unsafe fn alloc_pages(n: Pages) -> Result<NonNull<u8>, AllocErr> {
-    let ptr = grow_memory(n.0);
+    let ptr = wasm32::grow_memory(n.0 as i32);
     if -1 != ptr {
         let ptr = (ptr as usize * PAGE_SIZE.0) as *mut u8;
         assert_is_word_aligned(ptr as *mut u8);

wee_alloc/src/lib.rs

@@ -226,7 +226,7 @@ for hacking!
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "use_std_for_test_debugging"), no_std)]
 #![feature(alloc, allocator_api, core_intrinsics)]
-#![cfg_attr(target_arch = "wasm32", feature(link_llvm_intrinsics))]
+#![cfg_attr(target_arch = "wasm32", feature(stdsimd))]
 
 #[macro_use]
 extern crate cfg_if;