From c5f4c44f82905bef60d49254e250ba55e0e8f205 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 31 Dec 2017 13:15:52 +0000 Subject: error.c: limit depth * error.c (rb_warn_m): limit backtrace depth to reduce objects to be created but not used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 7ec59cd9f4..aba99c9840 100644 --- a/error.c +++ b/error.c @@ -342,12 +342,14 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc) uplevel = Qnil; } else if (!NIL_P(uplevel)) { + VALUE args[2]; long lev = NUM2LONG(uplevel); if (lev < 0) { rb_raise(rb_eArgError, "negative level (%ld)", lev); } - uplevel = LONG2NUM(lev + 1); - uplevel = rb_vm_thread_backtrace_locations(1, &uplevel, GET_THREAD()->self); + args[0] = LONG2NUM(lev + 1); + args[1] = INT2FIX(1); + uplevel = rb_vm_thread_backtrace_locations(2, args, GET_THREAD()->self); if (!NIL_P(uplevel)) { uplevel = rb_ary_entry(uplevel, 0); } @@ -360,7 +362,7 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc) else { VALUE path; path = rb_funcall(uplevel, rb_intern("path"), 0); - str = rb_sprintf("%s:%li: warning: ", + str = rb_sprintf("%s:%ld: warning: ", rb_string_value_ptr(&path), NUM2LONG(rb_funcall(uplevel, rb_intern("lineno"), 0))); } -- cgit v1.2.3