Merge branch 'bjorn/fix-warnings/OTP-9250' into dev

* bjorn/fix-warnings/OTP-9250:
  Eliminate alias warning in gcc 4.5.2
  erl_trace: Eliminate alias warning

4 files changed, 24 insertions, 16 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 32ea8588d2..d5d113200a 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1911,13 +1911,15 @@ void process_main(void)
 	      * Note that for the halfword emulator, the two first elements
 	      * of the array are used.
 	      */
-	     *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	     BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg;
+	     *pi = I+3;
 	     set_timer(c_p, unsigned_val(timeout_value));
 	 } else if (timeout_value == am_infinity) {
 	     c_p->flags |= F_TIMO;
 #if !defined(ARCH_64) || HALFWORD_HEAP
 	 } else if (term_to_Uint(timeout_value, &time_val)) {
-	     *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	     BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg;
+	     *pi = I+3;
 	     set_timer(c_p, time_val);
 #endif
 	 } else {		/* Wrong time */
@@ -1974,7 +1976,8 @@ void process_main(void)
       * we must test the F_INSLPQUEUE flag as well as the F_TIMO flag.
       */
      if ((c_p->flags & (F_INSLPQUEUE | F_TIMO)) == 0) {
-	 *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	 BeamInstr** p = (BeamInstr **) c_p->def_arg_reg;
+	 *p = I+3;
 	 set_timer(c_p, Arg(1));
      }
      goto wait2;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 8a56976905..05172aaefa 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -7637,7 +7637,8 @@ continue_exit_process(Process *p
 static void
 timeout_proc(Process* p)
 {
-    p->i = *((BeamInstr **) (UWord) p->def_arg_reg);
+    BeamInstr** pi = (BeamInstr **) p->def_arg_reg;
+    p->i = *pi;
     p->flags |= F_TIMO;
     p->flags &= ~F_INSLPQUEUE;
 
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index c0397ca6c3..8833137112 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1538,8 +1538,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
     Eterm tracee;
 #endif
     Eterm transformed_args[MAX_ARG];
-    DeclareTmpHeap(sub_bin_heap_et,ERL_SUB_BIN_SIZE,p);
-    ErlSubBin *sub_bin_heap = (ErlSubBin *) sub_bin_heap_et;
+    DeclareTypedTmpHeap(ErlSubBin,sub_bin_heap,p);
 
     ASSERT(tracer_pid);
     if (*tracer_pid == am_true) {
@@ -1600,21 +1599,20 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	if (is_boxed(arg) && header_is_bin_matchstate(*boxed_val(arg))) {
 	    ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(arg);
 	    ErlBinMatchBuffer* mb = &ms->mb;
-	    ErlSubBin* sb = sub_bin_heap;
 	    Uint bit_size;
 
 	    ASSERT(sub_bin_heap->thing_word == 0); /* At most one of match context */
 
 	    bit_size = mb->size - mb->offset;
-	    sb->thing_word = HEADER_SUB_BIN;
-	    sb->size = BYTE_OFFSET(bit_size);
-	    sb->bitsize = BIT_OFFSET(bit_size);
-	    sb->offs = BYTE_OFFSET(mb->offset);
-	    sb->bitoffs = BIT_OFFSET(mb->offset);
-	    sb->is_writable = 0;
-	    sb->orig = mb->orig;
-
-	    arg = make_binary(sb);
+	    sub_bin_heap->thing_word = HEADER_SUB_BIN;
+	    sub_bin_heap->size = BYTE_OFFSET(bit_size);
+	    sub_bin_heap->bitsize = BIT_OFFSET(bit_size);
+	    sub_bin_heap->offs = BYTE_OFFSET(mb->offset);
+	    sub_bin_heap->bitoffs = BIT_OFFSET(mb->offset);
+	    sub_bin_heap->is_writable = 0;
+	    sub_bin_heap->orig = mb->orig;
+
+	    arg = make_binary(sub_bin_heap);
 	}
 	transformed_args[i] = arg;
     }
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 7d5b1853e6..30b0a60611 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1894,6 +1894,8 @@ erts_alloc_message_heap(Uint size,
 #  if defined(DEBUG)
 #    define DeclareTmpHeap(VariableName,Size,Process) \
        Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,Process)
+#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
+      Type *VariableName = (Type *) erts_debug_allocate_tmp_heap(sizeof(Type)/sizeof(Eterm),Process)
 #    define DeclareTmpHeapNoproc(VariableName,Size) \
        Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,NULL)
 #    define UseTmpHeap(Size,Proc) \
@@ -1915,6 +1917,8 @@ erts_alloc_message_heap(Uint size,
 #  else
 #    define DeclareTmpHeap(VariableName,Size,Process) \
        Eterm *VariableName = (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
+#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
+      Type *VariableName = (Type *) (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
 #    define DeclareTmpHeapNoproc(VariableName,Size) \
        Eterm *VariableName = (erts_get_scheduler_data()->tmp_heap)+(erts_get_scheduler_data()->num_tmp_heap_used)
 #    define UseTmpHeap(Size,Proc) \
@@ -1940,6 +1944,8 @@ erts_alloc_message_heap(Uint size,
 #else
 #  define DeclareTmpHeap(VariableName,Size,Process) \
      Eterm VariableName[Size]
+#  define DeclareTypedTmpHeap(Type,VariableName,Process)	\
+     Type VariableName[1]
 #  define DeclareTmpHeapNoproc(VariableName,Size) \
      Eterm VariableName[Size]
 #  define UseTmpHeap(Size,Proc) /* Nothing */