---

yaml
---
r: 67285
b: refs/heads/master
c: ce1db94
h: refs/heads/master
i:
  67283: 79f8d16
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fdd71bece23b3d6776ca86336749e50560617a56
+refs/heads/master: ce1db94647fc82e0625a74fbf9670a7517aba996
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/check_match.rs

@@ -10,7 +10,7 @@
 
 
 use middle::const_eval::{compare_const_vals, lookup_const_by_id};
-use middle::const_eval::{eval_const_expr, const_val, const_bool, const_float};
+use middle::const_eval::{eval_const_expr, const_val, const_bool};
 use middle::pat_util::*;
 use middle::ty::*;
 use middle::ty;
@@ -102,27 +102,6 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[arm]) {
     let mut seen = ~[];
     for arms.iter().advance |arm| {
         for arm.pats.iter().advance |pat| {
-
-            // Check that we do not match against a static NaN (#6804)
-            let pat_matches_nan: &fn(@pat) -> bool = |p| {
-                match cx.tcx.def_map.find(&p.id) {
-                    Some(&def_static(did, false)) => {
-                        let const_expr = lookup_const_by_id(cx.tcx, did).get();
-                        match eval_const_expr(cx.tcx, const_expr) {
-                            const_float(f) if f.is_NaN() => true,
-                            _ => false
-                        }
-                    }
-                    _ => false
-                }
-            };
-            for walk_pat(*pat) |p| {
-                if pat_matches_nan(p) {
-                    cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \
-                                                   use is_NaN() in a guard instead");
-                }
-            }
-
             let v = ~[*pat];
             match is_useful(cx, &seen, v) {
               not_useful => {

trunk/src/rt/rust_task.cpp

@@ -152,8 +152,6 @@ cleanup_task(cleanup_args *args) {
 #endif
 }
 
-extern "C" CDECL void upcall_exchange_free(void *ptr);
-
 // This runs on the Rust stack
 void task_start_wrapper(spawn_args *a)
 {