projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup backend: make pre_spill_prepare_constraint independent of chordal allocator...
[libfirm]
/
ir
/
opt
/
opt_frame.c
diff --git
a/ir/opt/opt_frame.c
b/ir/opt/opt_frame.c
index
6c91193
..
a038e09
100644
(file)
--- a/
ir/opt/opt_frame.c
+++ b/
ir/opt/opt_frame.c
@@
-26,9
+26,7
@@
* @summary
* Optimize the frame type by removing unused type members.
*/
* @summary
* Optimize the frame type by removing unused type members.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include "iroptimize.h"
#include "irgraph_t.h"
#include "iroptimize.h"
#include "irgraph_t.h"
@@
-49,6
+47,8
@@
void opt_frame_irg(ir_graph *irg) {
if (n <= 0)
return;
if (n <= 0)
return;
+ irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
/* clear all entity links */
for (i = n - 1; i >= 0; --i) {
ent = get_class_member(frame_tp, i);
/* clear all entity links */
for (i = n - 1; i >= 0; --i) {
ent = get_class_member(frame_tp, i);
@@
-64,20
+64,24
@@
void opt_frame_irg(ir_graph *irg) {
/* mark all used entities */
foreach_out_edge(frame, edge) {
sel = get_edge_src_irn(edge);
/* mark all used entities */
foreach_out_edge(frame, edge) {
sel = get_edge_src_irn(edge);
- ent = get_Sel_entity(sel);
- set_entity_link(ent, ent);
+ if (is_Sel(sel)) {
+ ent = get_Sel_entity(sel);
+ set_entity_link(ent, ent);
+ }
}
}
- }
- else {
+ } else {
/* use traditionally out edges */
/* use traditionally out edges */
- if (get_irg_outs_state(irg) != outs_consistent)
- compute_irg_outs(irg);
+ assure_irg_outs(irg);
/* mark all used entities */
for (i = get_irn_n_outs(frame) - 1; i >= 0; --i) {
sel = get_irn_out(frame, i);
/* mark all used entities */
for (i = get_irn_n_outs(frame) - 1; i >= 0; --i) {
sel = get_irn_out(frame, i);
- ent = get_Sel_entity(sel);
- set_entity_link(ent, ent);
+ if (is_Sel(sel)) {
+ ent = get_Sel_entity(sel);
+ /* only entities on the frame */
+ if (get_entity_owner(ent) == frame_tp)
+ set_entity_link(ent, ent);
+ }
}
}
}
}
@@
-85,7
+89,8
@@
void opt_frame_irg(ir_graph *irg) {
list = NULL;
for (i = n - 1; i >= 0; --i) {
ent = get_class_member(frame_tp, i);
list = NULL;
for (i = n - 1; i >= 0; --i) {
ent = get_class_member(frame_tp, i);
- if (get_entity_link(ent) == NULL) {
+ /* beware of inner functions: those are NOT unused */
+ if (get_entity_link(ent) == NULL && !is_method_entity(ent)) {
set_entity_link(ent, list);
list = ent;
}
set_entity_link(ent, list);
list = ent;
}
@@
-100,4
+105,5
@@
void opt_frame_irg(ir_graph *irg) {
/* we changed the frame type, it's layout should be redefined */
set_type_state(frame_tp, layout_undefined);
}
/* we changed the frame type, it's layout should be redefined */
set_type_state(frame_tp, layout_undefined);
}
+ irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
}
}