Re: [buildrobot] SH broken

[Trevor Saunders <tsaunders at mozilla dot com>]

On Thu, Apr 24, 2014 at 04:24:37PM +0200, Jan-Benedict Glaw wrote:
> Hi!
> 
> Between e4b851a364..130ab9aafd (= r209457..r209513), most probably
> with 65b0537f9e (= r209482), I see failures for eg. sh64-linux (though
> only when built with config-list.mk):
> 
> g++ -c   -g -O2 -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE  -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -Werror -fno-common  -DHAVE_CONFIG_H -I. -I. -I../../../gcc/gcc -I../../../gcc/gcc/. -I../../../gcc/gcc/../include -I../../../gcc/gcc/../libcpp/include -I/opt/cfarm/mpc/include  -I../../../gcc/gcc/../libdecnumber -I../../../gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I../../../gcc/gcc/../libbacktrace    -I. -I. -I../../../gcc/gcc -I../../../gcc/gcc/. -I../../../gcc/gcc/../include -I../../../gcc/gcc/../libcpp/include -I/opt/cfarm/mpc/include  -I../../../gcc/gcc/../libdecnumber -I../../../gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I../../../gcc/gcc/../libbacktrace   ../../../gcc/gcc/config/sh/sh_treg_combine.cc
> In file included from ../../../gcc/gcc/config/sh/sh_treg_combine.cc:32:0:
> ../../../gcc/gcc/tree-pass.h:99:24: error: âvirtual unsigned int opt_pass::execute(function*)â was hidden [-Werror=overloaded-virtual]
>    virtual unsigned int execute (function *fun);
>                         ^
> ../../../gcc/gcc/config/sh/sh_treg_combine.cc:428:24: error:   by âvirtual unsigned int sh_treg_combine::execute()â [-Werror=overloaded-virtual]
>    virtual unsigned int execute (void);
>                         ^
> cc1plus: all warnings being treated as errors
> make[2]: *** [sh_treg_combine.o] Error 1
> 
> 
> Should be easy to fix by renaming sh's execute().

no, that was a bug in r209483, which I think I fixed by commit the below
as r209751

Trev

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cab1de..5e91288 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-24  Trevor Saunders  <tsaunders@mozilla.com>
+
+	* config/sh/sh_treg_combine.c (sh_treg_combine::execute): Take
+	function * argument.
+
 2014-04-24  Alan Lawrence  <alan.lawrence@arm.com>
 
 	* config/aarch64/aarch64.c (aarch64_evpc_tbl): Enable for bigendian.
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index 57eddd2..2548479 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -425,7 +425,7 @@ public:
   sh_treg_combine (gcc::context* ctx, bool split_insns, const char* name);
   virtual ~sh_treg_combine (void);
   virtual bool gate (function *);
-  virtual unsigned int execute (void);
+  virtual unsigned int execute (function *);
 
 private:
   // Type of ccreg store that is supported.
@@ -1441,7 +1441,7 @@ sh_treg_combine::gate (function *)
 }
 
 unsigned int
-sh_treg_combine::execute (void)
+sh_treg_combine::execute (function *fun)
 {
   unsigned int ccr0 = INVALID_REGNUM;
   unsigned int ccr1 = INVALID_REGNUM;
@@ -1468,7 +1468,7 @@ sh_treg_combine::execute (void)
   // Look for basic blocks that end with a conditional branch and try to
   // optimize them.
   basic_block bb;
-  FOR_EACH_BB_FN (bb, cfun)
+  FOR_EACH_BB_FN (bb, fun)
     {
       rtx i = BB_END (bb);
       if (any_condjump_p (i) && onlyjump_p (i))
> 
> MfG, JBG
> 
> -- 
>       Jan-Benedict Glaw      jbglaw@lug-owl.de              +49-172-7608481
> Signature of:              Fortschritt bedeutet, einen Schritt so zu machen,
> the second  :                   daà man den nÃchsten auch noch machen kann.

Attachment: signature.asc
Description: Digital signature