From fd47fed2699a53cdeb26d204a6fb6a4b75db42ac Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Sep 2011 06:44:59 +0000
Subject: [PATCH] * numeric.c (ruby_float_step): Avoid error on i386 and amd64.
   Patch by Vit Ondruch. Issue #4576 [rubyspec:a9525edcd]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 numeric.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7bdeddec37..9aae07f95e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 16 02:05:44 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (ruby_float_step): Avoid error on i386 and amd64.
+	  Patch by Vit Ondruch. Issue #4576.
+
 Thu Sep 15 11:39:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback
diff --git a/numeric.c b/numeric.c
index 18f5e1cd1a..1701d1005e 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1683,6 +1683,7 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 	double unit = NUM2DBL(step);
 	double n = (end - beg)/unit;
 	double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
+	double im = 0.0;
 	long i;
 
 	if (isinf(unit)) {
@@ -1691,7 +1692,8 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 	else {
 	    if (err>0.5) err=0.5;
 	    n = floor(n + err);
-	    if (!excl || ((long)n)*unit+beg < end) n++;
+	    im = ((long)n)*unit+beg;
+	    if (!excl || im < end) n++;
 	    for (i=0; i<n; i++) {
 		rb_yield(DBL2NUM(i*unit+beg));
 	    }