suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compiler bug that could cause infinite inlining loop

Browse Source 
The bug was that a procedure could be incorrectly marked as
a "leaf" procedure, which could in turn cause the compiler
to keep inlining a very small procedure that calls itself.

Closes PR 12270

Merge to 5.2
(cherry picked from commit 1bc80310e3)
This commit is contained in:
Matthew Flatt 2011-10-08 16:39:00 -06:00 committed by Eli Barzilay
parent a4a7b80c97
commit e1dfd37f75
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collects/tests/racket/optimize.rktl
View File

@ -1654,6 +1654,16 @@
(begin (f) #f)) (begin (f) #f))
#f)) #f))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Make sure the compiler doesn't end up in an infinite inling loop:
(module unc-small-self-call racket/base
(define unc1
(let ([x 1])
(lambda ()
(unc1))))
(unc1))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(report-errs) (report-errs)

20
src/racket/src/optimize.c
View File

@ -914,9 +914,9 @@ Scheme_Object *optimize_for_inline(Optimize_Info *info, Scheme_Object *le, int a
int offset = 0, single_use = 0, psize = 0; int offset = 0, single_use = 0, psize = 0;
Scheme_Object *bad_app = NULL, *prev = NULL, *orig_le = le; Scheme_Object *bad_app = NULL, *prev = NULL, *orig_le = le;
intptr_t prev_offset = 0; intptr_t prev_offset = 0;
int nested_count = 0, outside_nested = 0, already_opt = optimized_rator; int nested_count = 0, outside_nested = 0, already_opt = optimized_rator, nonleaf;
if (info->inline_fuel < 0) if ((info->inline_fuel < 0) && info->has_nonleaf)
return NULL; return NULL;
/* Move inside `let' bindings, so we can convert ((let (....) proc) arg ...) /* Move inside `let' bindings, so we can convert ((let (....) proc) arg ...)
@ -996,7 +996,9 @@ Scheme_Object *optimize_for_inline(Optimize_Info *info, Scheme_Object *le, int a
bad_app = le; bad_app = le;
} }
if (le && SAME_TYPE(SCHEME_TYPE(le), scheme_compiled_unclosed_procedure_type)) { nonleaf = 1;
if (le && SAME_TYPE(SCHEME_TYPE(le), scheme_compiled_unclosed_procedure_type) && (info->inline_fuel >= 0)) {
Scheme_Closure_Data *data = (Scheme_Closure_Data *)le; Scheme_Closure_Data *data = (Scheme_Closure_Data *)le;
int sz; int sz;
@ -1048,25 +1050,28 @@ Scheme_Object *optimize_for_inline(Optimize_Info *info, Scheme_Object *le, int a
return le; return le;
} else { } else {
LOG_INLINE(fprintf(stderr, "No inline %s\n", scheme_write_to_string(data->name ? data->name : scheme_false, NULL))); LOG_INLINE(fprintf(stderr, "No inline %s\n", scheme_write_to_string(data->name ? data->name : scheme_false, NULL)));
info->has_nonleaf = 1;
} }
} else { } else {
LOG_INLINE(fprintf(stderr, "No fuel %s %d[%d]>%d@%d %d\n", scheme_write_to_string(data->name ? data->name : scheme_false, NULL), LOG_INLINE(fprintf(stderr, "No fuel %s %d[%d]>%d@%d %d\n", scheme_write_to_string(data->name ? data->name : scheme_false, NULL),
sz, is_leaf, threshold, sz, is_leaf, threshold,
info->inline_fuel, info->use_psize)); info->inline_fuel, info->use_psize));
info->has_nonleaf = 1;
} }
} else { } else {
/* Issue warning below */ /* Issue warning below */
bad_app = (Scheme_Object *)data; bad_app = (Scheme_Object *)data;
nonleaf = 0;
} }
} }
if (le && SCHEME_PRIMP(le)) { if (le && SCHEME_PRIMP(le)) {
int opt; int opt;
opt = ((Scheme_Prim_Proc_Header *)le)->flags & SCHEME_PRIM_OPT_MASK; opt = ((Scheme_Prim_Proc_Header *)le)->flags & SCHEME_PRIM_OPT_MASK;
if (opt >= SCHEME_PRIM_OPT_NONCM) if (opt >= SCHEME_PRIM_OPT_NONCM) {
*_flags = (CLOS_PRESERVES_MARKS | CLOS_SINGLE_RESULT); *_flags = (CLOS_PRESERVES_MARKS | CLOS_SINGLE_RESULT);
if (opt >= SCHEME_PRIM_OPT_IMMEDIATE) {
nonleaf = 0;
}
}
} }
if (le && SCHEME_PROCP(le) && (app || app2 || app3)) { if (le && SCHEME_PROCP(le) && (app || app2 || app3)) {
@ -1074,6 +1079,7 @@ Scheme_Object *optimize_for_inline(Optimize_Info *info, Scheme_Object *le, int a
a[0] = le; a[0] = le;
if (!scheme_check_proc_arity(NULL, argc, 0, 1, a)) { if (!scheme_check_proc_arity(NULL, argc, 0, 1, a)) {
bad_app = le; bad_app = le;
nonleaf = 0;
} }
} }
@ -1083,7 +1089,7 @@ Scheme_Object *optimize_for_inline(Optimize_Info *info, Scheme_Object *le, int a
info->psize += psize; info->psize += psize;
} }
if (!le) if (nonleaf)
info->has_nonleaf = 1; info->has_nonleaf = 1;
if (bad_app) { if (bad_app) {