Author: chromatic
Date: Sat Apr  7 23:57:02 2007
New Revision: 18037

Modified:
   trunk/compilers/imcc/main.c
   trunk/t/compilers/imcc/imcpasm/opt2.t

Log:
Remove commented-out code.

This *does* change optimization levels, so if weird tests start failing on
other platforms, revert this patch quick as a whistle.  (The warnings are very
old, though, so I feel little perhaps too little trepidation.)

Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c (original)
+++ trunk/compilers/imcc/main.c Sat Apr  7 23:57:02 2007
@@ -320,25 +320,15 @@
                     IMCC_INFO(interp)->optimizer_level |= OPT_SUB;
 
                 IMCC_INFO(interp)->allocator = IMCC_GRAPH_ALLOCATOR;
-#if 0
                 /* currently not ok due to different register allocation */
                 if (strchr(optimizer_opt, 'j')) {
-                    int one = 1;
-                    optimizer_level |= (OPT_J | OPT_PASM);
-                    Parrot_setflag(interp, PARROT_JIT_FLAG, &one);
+                    SET_CORE(PARROT_JIT_CORE);
                 }
-#endif
                 if (strchr(optimizer_opt, '1')) {
                     IMCC_INFO(interp)->optimizer_level |= OPT_PRE;
                 }
                 if (strchr(optimizer_opt, '2')) {
-                    /* FIXME -O2 is borken */
-#if 1
-                    IMCC_INFO(interp)->optimizer_level |=
-                        (OPT_PRE | OPT_CFG);
-#else
-                    IMCC_INFO(interp)->optimizer_level |= OPT_PRE;
-#endif
+                    IMCC_INFO(interp)->optimizer_level |= (OPT_PRE | OPT_CFG);
                 }
                 if (strchr(optimizer_opt, 't')) {
                     SET_CORE(PARROT_SWITCH_CORE);

Modified: trunk/t/compilers/imcc/imcpasm/opt2.t
==============================================================================
--- trunk/t/compilers/imcc/imcpasm/opt2.t       (original)
+++ trunk/t/compilers/imcc/imcpasm/opt2.t       Sat Apr  7 23:57:02 2007
@@ -7,9 +7,6 @@
 use lib qw( . lib ../lib ../../lib );
 use Parrot::Test tests => 6;
 
-#SKIP: {
-#  skip("-O2 disabled", 5);
-
 # these tests are run with -O2 by TestCompiler and show
 # generated PASM code for various optimizations at level 2
 
@@ -152,8 +149,6 @@
   end
 OUT
 
-#}
-
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4

Reply via email to