use xmalloc instead of malloc

[libfirm] / ir / ir / ircons.c

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 5b7cb1b..02903ca 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -16,29 +16,30 @@
 #endif
 
 #ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+# include <alloca.h>
 #endif
 #ifdef HAVE_MALLOC_H
-#include <malloc.h>
+# include <malloc.h>
 #endif
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 
-# include "irprog_t.h"
-# include "irgraph_t.h"
-# include "irnode_t.h"
-# include "irmode_t.h"
-# include "ircons_t.h"
-# include "firm_common_t.h"
-# include "irvrfy.h"
-# include "irop_t.h"
-# include "iropt_t.h"
-# include "irgmod.h"
-# include "array.h"
-# include "irbackedge_t.h"
-# include "irflag_t.h"
-# include "iredges_t.h"
+#include "irprog_t.h"
+#include "irgraph_t.h"
+#include "irnode_t.h"
+#include "irmode_t.h"
+#include "ircons_t.h"
+#include "firm_common_t.h"
+#include "irvrfy.h"
+#include "irop_t.h"
+#include "iropt_t.h"
+#include "irgmod.h"
+#include "array.h"
+#include "irbackedge_t.h"
+#include "irflag_t.h"
+#include "iredges_t.h"
+#include "irflag_t.h"
 
 #if USE_EXPLICIT_PHI_IN_STACK
 /* A stack needed for the automatic Phi node construction in constructor
@@ -1255,7 +1256,12 @@ ir_node *new_rd_SymConst_type_tag (dbg_info *db, ir_graph *irg, ir_type *symbol,
 
 ir_node *new_rd_SymConst_size (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) {
   symconst_symbol sym = {symbol};
-  return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_size, tp);
+  return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_size, tp);
+}
+
+ir_node *new_rd_SymConst_align (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) {
+  symconst_symbol sym = {symbol};
+  return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_align, tp);
 }
 
 ir_node *
@@ -2216,15 +2222,14 @@ static INLINE ir_node ** new_frag_arr (ir_node *n)
     arr[0] = new_Proj(n, mode_M, pn_Call_M_except);
   else if (get_irn_op(n) == op_CopyB)
     arr[0] = new_Proj(n, mode_M, pn_CopyB_M_except);
-  else if (get_irn_op(n) == op_Bound)
-    arr[0] = new_Proj(n, mode_M, pn_Bound_M_except);
   else {
     assert((pn_Quot_M == pn_DivMod_M) &&
        (pn_Quot_M == pn_Div_M)    &&
        (pn_Quot_M == pn_Mod_M)    &&
        (pn_Quot_M == pn_Load_M)   &&
        (pn_Quot_M == pn_Store_M)  &&
-       (pn_Quot_M == pn_Alloc_M)    );
+       (pn_Quot_M == pn_Alloc_M)  &&
+       (pn_Quot_M == pn_Bound_M));
     arr[0] = new_Proj(n, mode_M, pn_Alloc_M);
   }
   set_optimize(opt);
@@ -3080,25 +3085,30 @@ set_store (ir_node *store)
 
   assert(get_irg_phase_state (current_ir_graph) == phase_building);
 
-  /* handle non-volatile Load nodes by automatically creating Sync's */
-  load = skip_Proj(store);
-  if (is_Load(load) && get_Load_volatility(load) == volatility_non_volatile) {
-    pred = get_Load_mem(load);
+  if (get_opt_auto_create_sync()) {
+    /* handle non-volatile Load nodes by automatically creating Sync's */
+    load = skip_Proj(store);
+    if (is_Load(load) && get_Load_volatility(load) == volatility_non_volatile) {
+      pred = get_Load_mem(load);
 
-    if (is_Sync(pred)) {
-      /* a Load after a Sync: move it up */
-      set_Load_mem(load, get_Sync_pred(pred, 0));
-      store = pred;
-    }
-    else {
-      pload = skip_Proj(pred);
-      if (is_Load(pload) && get_Load_volatility(pload) == volatility_non_volatile) {
-        /* a Load after a Load: create a new Sync */
-        set_Load_mem(load, get_Load_mem(pload));
-
-        in[0] = pred;
-        in[1] = store;
-        store = new_Sync(2, in);
+      if (is_Sync(pred)) {
+        /* a Load after a Sync: move it up */
+        ir_node *mem = skip_Proj(get_Sync_pred(pred, 0));
+
+        set_Load_mem(load, get_memop_mem(mem));
+        add_Sync_pred(pred, store);
+        store = pred;
+      }
+      else {
+        pload = skip_Proj(pred);
+        if (is_Load(pload) && get_Load_volatility(pload) == volatility_non_volatile) {
+          /* a Load after a Load: create a new Sync */
+          set_Load_mem(load, get_Load_mem(pload));
+
+          in[0] = pred;
+          in[1] = store;
+          store = new_Sync(2, in);
+        }
       }
     }
   }