get_irg_frame_type() now calls skip_tid()

[r6248]

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 24ac3a7..3ca0932 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -532,7 +532,7 @@ void
 }
 
 type *
-(get_irg_frame_type)(const ir_graph *irg) {
+(get_irg_frame_type)(ir_graph *irg) {
   return _get_irg_frame_type(irg);
 }
 

diff --git a/ir/ir/irgraph.h b/ir/ir/irgraph.h
index 932ccd8..4ea428a 100644 (file)
--- a/ir/ir/irgraph.h
+++ b/ir/ir/irgraph.h
@@ -198,7 +198,7 @@ int      is_ir_graph(const void *thing);
 entity  *get_irg_entity (const ir_graph *irg);
 void     set_irg_entity (ir_graph *irg, entity *ent);
 
-type    *get_irg_frame_type (const ir_graph *irg);
+type    *get_irg_frame_type (ir_graph *irg);
 void     set_irg_frame_type (ir_graph *irg, type *ftp);
 /* To test for a frame type. O(#irgs) if ftp is class type.  */
 int      is_frame_type (const type *ftp);

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 3d29819..5381231 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -29,6 +29,7 @@
 #include "irprog.h"
 #include "pseudo_irg.h"
 #include "type_t.h"
+#include "typegmod.h"
 #include "tr_inheritance.h"
 
 #include "irloop.h"
@@ -340,9 +341,9 @@ _set_irg_entity(ir_graph *irg, entity *ent) {
 }
 
 static INLINE type *
-_get_irg_frame_type(const ir_graph *irg) {
+_get_irg_frame_type(ir_graph *irg) {
   assert(irg && irg->frame_type);
-  return irg->frame_type;
+  return irg->frame_type = skip_tid(irg->frame_type);
 }
 
 static INLINE void