kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29155 from trunk into ruby_1_9_2. fixes #3777, #3772 and #3722.

Browse source 
--
* thread.c (ruby_suppress_tracing): restore the state and invoke
  the func with normal state.  a patch from Satoshi Shiba <shiba
  AT rvm.jp> at [ruby-dev:42162].  [ruby-core:31783]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-10-23 13:38:37 +00:00
parent b98fa0b2a5
commit 7f5d559cfc
4 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Sep 1 12:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (ruby_suppress_tracing): restore the state and invoke
the func with normal state. a patch from Satoshi Shiba <shiba
AT rvm.jp> at [ruby-dev:42162]. [ruby-core:31783]
Tue Aug 31 17:32:34 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tue Aug 31 17:32:34 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling

12
test/ruby/test_trace.rb
View file

@ -46,4 +46,16 @@ class TestTrace < Test::Unit::TestCase
ensure ensure
untrace_var :$x untrace_var :$x
end end
def test_trace_break
bug2722 = '[ruby-core:31783]'
a = Object.new.extend(Enumerable)
def a.each
yield
end
assert(Thread.start {
Thread.current.add_trace_func(proc{})
a.any? {true}
}.value, bug2722)
end
end end

4
thread.c
View file

@ -4090,6 +4090,7 @@ ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
int state, tracing; int state, tracing;
volatile int raised; volatile int raised;
volatile int outer_state;
VALUE result = Qnil; VALUE result = Qnil;
if ((tracing = th->tracing) != 0 && !always) { if ((tracing = th->tracing) != 0 && !always) {
@ -4100,6 +4101,8 @@ ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
} }
raised = rb_threadptr_reset_raised(th); raised = rb_threadptr_reset_raised(th);
outer_state = th->state;
th->state = 0;
PUSH_TAG(); PUSH_TAG();
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
@ -4115,6 +4118,7 @@ ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
if (state) { if (state) {
JUMP_TAG(state); JUMP_TAG(state);
} }
th->state = outer_state;
return result; return result;
} }

2
version.h
View file

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