aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-10 18:18:31 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-10 18:18:31 +0000
commitaf4e6084d09824ffa2c036d017369607adcc014e (patch)
tree208e6fae156ad0f77df226046666a068e76da8b1
parent9a938987cb6b3ed3f0c7735f5b19b10f45694a3f (diff)
downloadruby-af4e6084d09824ffa2c036d017369607adcc014e.tar.gz
* insns.def: Fix optimization bug of Float#/ [Bug #9238]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--insns.def2
-rw-r--r--test/ruby/test_optimization.rb1
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cd5cf182b..6236a7766b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 11 03:18:08 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * insns.def: Fix optimization bug of Float#/ [Bug #9238]
+
Tue Dec 10 23:58:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_strptime.c (date__strptime_internal): unset
diff --git a/insns.def b/insns.def
index a636f555e4..ad4bba6912 100644
--- a/insns.def
+++ b/insns.def
@@ -1511,7 +1511,7 @@ opt_div
val = LONG2NUM(div);
}
else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
}
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index a3b4aedcdc..fe25cdf1c9 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -67,6 +67,7 @@ class TestRubyOptimization < Test::Unit::TestCase
def test_fixnum_div
assert_equal 3, 15 / 5
+ assert_equal 6.66, redefine_method('Float', '/') { 4.2 / 6.66 }, "bug 9238"
end
def test_fixnum_mod