rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f17

Browse Source
This commit is contained in:
Mamoru Tasaka 2013-01-16 23:24:54 +09:00
commit 9c8430ad61
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ruby-1.9.3-p327-PR7629-save-proc.patch Normal file
View File

@ -0,0 +1,45 @@
Mon Jan 7 15:50:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (rb_vm_make_proc): save the proc made from the given block so
that it will not get collected. [ruby-core:50545] [Bug #7507]
diff --git a/vm.c b/vm.c
index 4dd242f..70e8d3b 100644
--- a/vm.c
+++ b/vm.c
@@ -468,10 +468,18 @@
}
static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block);
+static VALUE vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp, VALUE *blockprocptr);
VALUE
rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
{
+ VALUE blockprocval;
+ return vm_make_env_object(th, cfp, &blockprocval);
+}
+
+static VALUE
+vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp, VALUE *blockprocptr)
+{
VALUE envval;
VALUE *lfp;
rb_block_t *blockptr;
@@ -489,6 +497,7 @@
rb_proc_t *p;
GetProcPtr(blockprocval, p);
lfp[0] = GC_GUARDED_PTR(&p->block);
+ *blockprocptr = blockprocval;
}
envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp);
@@ -559,7 +568,7 @@
rb_bug("rb_vm_make_proc: Proc value is already created.");
}
- envval = rb_vm_make_env_object(th, cfp);
+ envval = vm_make_env_object(th, cfp, &blockprocval);
if (PROCDEBUG) {
check_env_value(envval);

13
ruby.spec
View File

@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
# we cannot reset the release number to 1 even when the main (ruby) version # we cannot reset the release number to 1 even when the main (ruby) version
# is updated - because it may be that the versions of sub-components don't # is updated - because it may be that the versions of sub-components don't
# change. # change.
Release: 24%{?dist} Release: 25%{?dist}
Group: Development/Languages Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ... # Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain License: (Ruby or BSD) and Public Domain
@ -100,6 +100,10 @@ Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch
#Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch #Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch
# Make mkmf verbose by default # Make mkmf verbose by default
Patch12: ruby-1.9.3-mkmf-verbose.patch Patch12: ruby-1.9.3-mkmf-verbose.patch
# http://bugs.ruby-lang.org/issues/7629
# https://bugzilla.redhat.com/show_bug.cgi?id=895173
# save the proc made from the given block
Patch13: ruby-1.9.3-p327-PR7629-save-proc.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version} Requires: ruby(rubygems) >= %{rubygems_version}
@ -342,6 +346,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch10 -p1 %patch10 -p1
#%%patch11 -p1 #%%patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1
%build %build
autoconf autoconf
@ -753,7 +758,11 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-24 * Wed Jan 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-25
- Backport fix for the upstream PR7629, save the proc made from the given block
(bug 895173)
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-24
- Update to 1.9.3.362 - Update to 1.9.3.362
* Mon Dec 03 2012 Jaromir Capik <jcapik@redhat.com> - 1.9.3.327-23 * Mon Dec 03 2012 Jaromir Capik <jcapik@redhat.com> - 1.9.3.327-23