archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r31822 and r31823 from trunk into ruby_1_9_2.

Browse source 
--
* insns.def (opt_mult): as r31805, volatile it.
  Without this, clang -O fails calculation.

* numeric.c (fix_mul): ditto.

* rational.c (f_imul): ditto.
--
Fix mixed declarations in r31822.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-31 00:13:30 +00:00
parent a6cafde278
commit 031d624b38
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon May 30 15:44:16 2011 NARUSE, Yui <naruse@ruby-lang.org>
* insns.def (opt_mult): as r31805, volatile it.
Without this, clang -O fails calculation.
* numeric.c (fix_mul): ditto.
* rational.c (f_imul): ditto.
Mon May 30 10:26:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (int_pow): make sure to assign the result of x * z.

3
insns.def
View file

@ -1445,13 +1445,14 @@ opt_mult
{
if (FIXNUM_2_P(recv, obj) &&
BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
long a, b, c;
long a, b;
a = FIX2LONG(recv);
if (a == 0) {
val = recv;
}
else {
volatile long c;
b = FIX2LONG(obj);
c = a * b;

2
numeric.c
View file

@ -2322,7 +2322,7 @@ fix_mul(VALUE x, VALUE y)
#if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
LONG_LONG d;
#else
long c;
volatile long c;
VALUE r;
#endif

2
rational.c
View file

@ -588,7 +588,7 @@ inline static VALUE
f_imul(long a, long b)
{
VALUE r;
long c;
volatile long c;
if (a == 0 || b == 0)
return ZERO;

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 261
#define RUBY_PATCHLEVEL 262
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1