From 21ca6d3a137034f19862db769a5b7f1c5528dbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 15 Oct 2012 16:11:55 +0200
Subject: beam_makeops: Eliminate a deprecation warning

Perl 5.16.1 (and perhaps other versions) issues the following
warning:

  defined(@array) is deprecated at utils/beam_makeops line 1714.
        (Maybe you should just omit the defined()?)

for the following line:

$prev_last = pop(@{$gen_transform{$key}})
	if defined @{$gen_transform{$key}};   # LINE 1714

The documentation for "defined" says that its use on hashes and
arrays is deprecated and that it may stop working in a future
release.

Simply removing "defined" (as suggested by the warning message)
will not work, as there will be an error when trying to use an
undefined value as an array reference:

  Can't use an undefined value as an ARRAY reference at
  utils/beam_makeops line 1714.

What we must do is to check whether $gen_transform{$key} is
defined before trying to use it as an array reference.

Noticed-by: Tuncer Ayaz
---
 erts/emulator/utils/beam_makeops | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 8fe2402ca8..8abe454cd1 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -1711,7 +1711,7 @@ sub tr_gen_to {
 
     my $prev_last;
     $prev_last = pop(@{$gen_transform{$key}})
-	if defined @{$gen_transform{$key}}; # Fail
+	if defined $gen_transform{$key}; # Fail
 
     if ($prev_last && !is_instr($prev_last, 'fail')) {
 	error("Line $line: A previous transformation shadows '$orig_transform'");
-- 
cgit v1.2.3


From fc8a219161bfd9fe9d6b3b2f0d9922dee0ab3d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 15 Oct 2012 11:04:26 +0200
Subject: beam_makeops: Turn on warnings and eliminate existing warnings

---
 erts/emulator/utils/beam_makeops | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 8abe454cd1..16a949c2a6 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/env perl -W
 #
 # %CopyrightBegin%
 #
@@ -362,7 +362,7 @@ while (<>) {
 	    $gen_to_spec{"$name/$arity"} = undef;
 	    $num_specific{"$name/$arity"} = 0;
 	    $min_window{"$name/$arity"} = 255;
-	    $obsolete[$op_num] = $obsolete eq '-';
+	    $obsolete[$op_num] = defined $obsolete;
 	} else {		# Unnumbered generic operation.
 	    push(@unnumbered_generic, [$name, $arity]);
 	    $unnumbered{$name,$arity} = 1;
@@ -379,7 +379,7 @@ while (<>) {
 	if @args > $max_spec_operands;
     &syntax_check($name, @args);
     my $arity = @args;
-    if ($obsolete[$gen_opnum{$name,$arity}]) {
+    if (defined $gen_opnum{$name,$arity} and $obsolete[$gen_opnum{$name,$arity}]) {
 	error("specific instructions may not be specified for obsolete instructions");
     }
     push(@{$specific_op{"$name/$arity"}}, [$name, $hot, @args]);
@@ -810,8 +810,8 @@ sub compiler_output {
     #
     # Generate .hrl file.
     #
-    my($name) = "$outdir/${module}.hrl";
-    open(STDOUT, ">$name") || die "Failed to open $name for writing: $!\n";
+    my($hrl_name) = "$outdir/${module}.hrl";
+    open(STDOUT, ">$hrl_name") || die "Failed to open $hrl_name for writing: $!\n";
     &comment('erlang');
 
     for ($i = 0; $i < @tag_type && $i < 8; $i++) {
@@ -1251,8 +1251,8 @@ sub compile_transform {
 	$arity++ unless $list[1] eq '*';
 	$_ = [ @list ];
     }
-
-    if ($obsolete[$gen_opnum{$name,$arity}]) {
+    
+    if (defined $gen_opnum{$name,$arity} && $obsolete[$gen_opnum{$name,$arity}]) {
 	error("obsolete function must not be used in transformations");
     }
 
@@ -1704,7 +1704,8 @@ sub tr_gen_to {
     #
     my($first_ref) = shift(@code);
     my($size, $first, $key) = @$first_ref;
-    my($dummy, $op, $arity) = @$first;
+    my($dummy, $arity);
+    ($dummy, $op, $arity) = @$first;
     my($comment) = "\n/*\n * Line $line:\n *   $orig_transform\n */\n\n";
     $min_window{$key} = $min_window
 	if $min_window{$key} > $min_window;
@@ -1719,7 +1720,7 @@ sub tr_gen_to {
     unless ($cannot_fail) {
 	unshift(@code, make_op('', 'try_me_else',
 			       tr_code_len(@code)));
-	push(@code, make_op(""), make_op("$key", 'fail'));
+	push(@code, make_op("$key", 'fail'));
     }
     unshift(@code, make_op($comment));
     push(@{$gen_transform{$key}}, @code),
-- 
cgit v1.2.3