1 files changed, 4 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index ada023fff4..43a85cd840 100644
--- a/eval.c
+++ b/eval.c
@@ -2964,6 +2964,7 @@ rb_eval(self, n)
 	      iter_retry:
 		PUSH_ITER(ITER_PRE);
 		if (nd_type(node) == NODE_ITER) {
+		    ruby_frame->node = node;
 		    result = rb_eval(self, node->nd_iter);
 		}
 		else {
@@ -6055,10 +6056,10 @@ eval(self, src, scope, file, line)
 	ruby_cref = data->cref;
 	old_wrapper = ruby_wrapper;
 	ruby_wrapper = data->wrapper;
-	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) {
-	    file = data->body->nd_file;
+	if (file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) {
+	    file = data->frame.node->nd_file;
 	    if (!file) file = "__builtin__";
-	    line = nd_line(data->body);
+	    line = nd_line(data->frame.node);
 	}
 
 	self = data->self;