merges r27817 from trunk into ruby_1_9_2.

--
* proc.c (proc_binding): don't propagative filename and line_no of
  binding that is created from C level.  [ruby-dev:41322]

* vm_eval.c (eval_string_with_cref): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 16 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 47d5f0d401..91510163e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 16 17:16:09 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (proc_binding): don't propagative filename and line_no of
+	  binding that is created from C level.  [ruby-dev:41322]
+
+	* vm_eval.c (eval_string_with_cref): ditto.
+
 Sun May 16 13:55:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (rb_loaderror): use locale string, not ascii-8bit.
diff --git a/proc.c b/proc.c
index fc05a8eae0..b4ecd576c8 100644
--- a/proc.c
+++ b/proc.c
@@ -1897,8 +1897,14 @@ proc_binding(VALUE self)
     bindval = binding_alloc(rb_cBinding);
     GetBindingPtr(bindval, bind);
     bind->env = proc->envval;
-    bind->filename = proc->block.iseq->filename;
-    bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
+    if (RUBY_VM_NORMAL_ISEQ_P(proc->block.iseq)) {
+	bind->filename = proc->block.iseq->filename;
+	bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
+    }
+    else {
+	bind->filename = Qnil;
+	bind->line_no = 0;
+    }
     return bindval;
 }
 
diff --git a/vm_eval.c b/vm_eval.c
index 7a8fffedb9..22d60ee819 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -966,7 +966,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 	    if (rb_obj_is_kind_of(scope, rb_cBinding)) {
 		GetBindingPtr(scope, bind);
 		envval = bind->env;
-		if (strcmp(file, "(eval)") == 0) {
+		if (strcmp(file, "(eval)") == 0 && bind->filename != Qnil) {
 		    file = RSTRING_PTR(bind->filename);
 		    line = bind->line_no;
 		}