summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-16 16:40:50 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-16 16:40:50 +0000
commit65c5fe38e4baee78abebe2a77c41e739129da57c (patch)
tree38ec12f0c55e8048a0922b5f992df32a2368b61e
parent3bf8ec8fd72b6e23b9127d940e7740f7c600837a (diff)
downloadruby-65c5fe38e4baee78abebe2a77c41e739129da57c.tar.gz
ruby-65c5fe38e4baee78abebe2a77c41e739129da57c.tar.xz
ruby-65c5fe38e4baee78abebe2a77c41e739129da57c.zip
* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
to NODE_LIT. [ruby-dev:22920] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b0084231f..1ba58dadc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
+
+ * eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+ to NODE_LIT. [ruby-dev:22920]
+
Tue Feb 17 01:20:57 2004 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb: new module FileUtils::DryRun.
diff --git a/eval.c b/eval.c
index 9d46524f0..e4890de26 100644
--- a/eval.c
+++ b/eval.c
@@ -3643,6 +3643,9 @@ rb_eval(self, n)
nd_set_type(node, NODE_LIT);
node->nd_lit = result;
break;
+ case NODE_LIT:
+ /* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
+ goto again;
case NODE_DXSTR:
result = rb_funcall(self, '`', 1, str);
break;