---

yaml
---
r: 32351
b: refs/heads/dist-snap
c: ac31fdd
h: refs/heads/master
i:
  32349: 765aa65
  32347: 788d1c1
  32343: 0a7852b
  32335: 6877eb3
  32319: 8460f32
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: cd15eac9cf479feadffc546c05289f071601978a
+refs/heads/dist-snap: ac31fdd9c4e3efbab473614bf1a7386f18ac9ae9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/trans/base.rs

@@ -2504,11 +2504,39 @@ fn lval_static_fn_inner(bcx: block, fn_id: ast::def_id, id: ast::node_id,
 
     // Check whether this fn has an inlined copy and, if so, redirect fn_id to
     // the local id of the inlined copy.
+    let original_crate = fn_id.crate;
     let fn_id = if fn_id.crate != ast::local_crate {
         maybe_instantiate_inline(ccx, fn_id)
     } else { fn_id };
 
-    if fn_id.crate == ast::local_crate && tys.len() > 0u {
+    let must_monomorphise = {
+        let local_with_type_params =
+            fn_id.crate == ast::local_crate && tys.len() > 0u;
+
+        // Rust intrinsic functions should always be monomorphised
+        let inlined_rust_intrinsic = {
+            if fn_id.crate == ast::local_crate
+                && original_crate != ast::local_crate {
+
+                let map_node = session::expect(
+                    ccx.sess,
+                    ccx.tcx.items.find(fn_id.node),
+                    || fmt!("inlined item should be in ast map"));
+
+                match map_node {
+                  ast_map::node_foreign_item(
+                      _, ast::foreign_abi_rust_intrinsic, _) => true,
+                  _ => false
+                }
+            } else {
+                false
+            }
+        };
+
+        local_with_type_params || inlined_rust_intrinsic
+    };
+
+    if must_monomorphise {
         let mut {val, must_cast} =
             monomorphic_fn(ccx, fn_id, tys, vtables, Some(id));
         if must_cast {

branches/dist-snap/src/test/run-pass/intrinsic-atomics-cc.rs

@@ -1,8 +1,6 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_intrinsic.rs
 
-// xfail-test
-
 use cci_intrinsic;
 import cci_intrinsic::atomic_xchg;