- added missing skip_tid()

- removed wrong const specifier

[r16471]

diff --git a/include/libfirm/irnode.h b/include/libfirm/irnode.h
index ce32782..2cde904 100644 (file)
--- a/include/libfirm/irnode.h
+++ b/include/libfirm/irnode.h
@@ -889,7 +889,7 @@ void     set_Conv_strict(ir_node *node, int flag);
  */
 ir_node *get_Cast_op(const ir_node *node);
 void     set_Cast_op(ir_node *node, ir_node *op);
-ir_type *get_Cast_type(const ir_node *node);
+ir_type *get_Cast_type(ir_node *node);
 void     set_Cast_type(ir_node *node, ir_type *to_tp);
 
 /** Checks for upcast.

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index bd90f47..e81e212 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -1120,6 +1120,7 @@ int (is_Const_all_one)(const ir_node *node) {
 ir_type *
 get_Const_type(ir_node *node) {
        assert(node->op == op_Const);
+       node->attr.con.tp = skip_tid(node->attr.con.tp);
        return node->attr.con.tp;
 }
 
@@ -1514,8 +1515,9 @@ void set_Conv_strict(ir_node *node, int strict_flag) {
 }
 
 ir_type *
-get_Cast_type(const ir_node *node) {
+get_Cast_type(ir_node *node) {
        assert(node->op == op_Cast);
+       node->attr.cast.totype = skip_tid(node->attr.cast.totype);
        return node->attr.cast.totype;
 }