From 8dadb1a6256d3d426b8df2042b9ba207b5848989 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 19 Apr 2013 10:09:57 -0400
Subject: [PATCH] Bug 859257 - Backout original fix 4c0d13ce4c4a since
 ab6e995676bd has superseded it

---
 js/src/vm/NumericConversions.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 674df8cb58c..6fe57ad5738 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -41,13 +41,7 @@ ToIntWidth(double d)
 {
 #if defined(__i386__) || defined(__i386) || defined(__x86_64__) || \
     defined(_M_IX86) || defined(_M_X64)
-
-#ifdef __clang__
-    /* volatile to keep Clang from miscompiling, see bug 859257. */
-    volatile detail::DoublePun du, duh, twoWidth;
-#else
     detail::DoublePun du, duh, twoWidth;
-#endif
     uint32_t di_h, u_tmp, expon, shift_amount;
     int32_t mask32;