projects
/
libfirm
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4bc10a
)
code cleanup
author
Michael Beck
<beck@ipd.info.uni-karlsruhe.de>
Mon, 10 Mar 2008 13:38:26 +0000
(13:38 +0000)
committer
Michael Beck
<beck@ipd.info.uni-karlsruhe.de>
Mon, 10 Mar 2008 13:38:26 +0000
(13:38 +0000)
[r18043]
ir/ir/irgopt.c
patch
|
blob
|
history
diff --git
a/ir/ir/irgopt.c
b/ir/ir/irgopt.c
index
26dd09c
..
8be6585
100644
(file)
--- a/
ir/ir/irgopt.c
+++ b/
ir/ir/irgopt.c
@@
-1003,7
+1003,7
@@
int inline_method(ir_node *call, ir_graph *called_graph) {
ir_node *ret, *phi;
int arity, n_ret, n_exc, n_res, i, n, j, rem_opt, irn_arity;
enum exc_mode exc_handling;
ir_node *ret, *phi;
int arity, n_ret, n_exc, n_res, i, n, j, rem_opt, irn_arity;
enum exc_mode exc_handling;
- ir_type *called_frame;
+ ir_type *called_frame
, *curr_frame
;
irg_inline_property prop = get_irg_inline_property(called_graph);
ir_entity *ent;
irg_inline_property prop = get_irg_inline_property(called_graph);
ir_entity *ent;
@@
-1120,10
+1120,11
@@
int inline_method(ir_node *call, ir_graph *called_graph) {
/* -- Replicate local entities of the called_graph -- */
/* copy the entities. */
called_frame = get_irg_frame_type(called_graph);
/* -- Replicate local entities of the called_graph -- */
/* copy the entities. */
called_frame = get_irg_frame_type(called_graph);
+ curr_frame = get_irg_frame_type(current_ir_graph);
for (i = 0, n = get_class_n_members(called_frame); i < n; ++i) {
ir_entity *new_ent, *old_ent;
old_ent = get_class_member(called_frame, i);
for (i = 0, n = get_class_n_members(called_frame); i < n; ++i) {
ir_entity *new_ent, *old_ent;
old_ent = get_class_member(called_frame, i);
- new_ent = copy_entity_own(old_ent,
get_cur_frame_type()
);
+ new_ent = copy_entity_own(old_ent,
curr_frame
);
set_entity_link(old_ent, new_ent);
}
set_entity_link(old_ent, new_ent);
}