summaryrefslogtreecommitdiff
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
commit1ce8c1378b8296c73e174db85b156cd51f5ce059 (patch)
treeff2946235a6a3415ee11d9d091a6d85faa8623bd
parentab0cb932b6176d91f88ed7c81cc211021e72b084 (diff)
* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
to NODE_LIT. [ruby-dev:22920] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 bc2f2f65be..72266c8c57 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:24:35 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: backport from 1.9 - configure. (Thanks Nakada)
diff --git a/eval.c b/eval.c
index 8c5e78bd2b..8565bde72d 100644
--- a/eval.c
+++ b/eval.c
@@ -3639,6 +3639,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;