Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 254 → Rev 255

/branches/7.8-stable/debian/changelog
4,9 → 4,11
optimizer rules that weren't protected against negation overflow,
causing an infinite loop when building the GL module (Closes:
#836673).
* Build against libkrb5-dev instead of heimdal-dev (Closes: #806264,
#836683). (Not bothering with -multidev right now.)
* Bump Standards-Version to 3.9.8.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 29 Sep 2016 22:48:35 +0200
-- Magnus Holmgren <holmgren@debian.org> Fri, 30 Sep 2016 07:54:39 +0200
 
pike7.8 (7.8.866-5) unstable; urgency=low
 
/branches/7.8-stable/debian/control
12,7 → 12,7
libgtksourceview2.0-dev, libfreetype6-dev, freeglut3-dev,
libjpeg-dev, libtiff-dev, librsvg2-dev (>= 2.7), libgnomeui-dev,
libfuse-dev, libfftw3-dev, libavahi-compat-libdnssd-dev,
heimdal-dev
libkrb5-dev
Build-Conflicts: libutahglx-dev
Homepage: http://pike.lysator.liu.se/
Vcs-Svn: svn://anonscm.debian.org/pkg-pike/branches/7.8-stable
/branches/7.8-stable/debian/patches/disable_peephole_opt_integer_overflow.patch
45,6 → 45,63
BRANCH_WHEN_ZERO BRANCH LABEL ($1a): BRANCH_WHEN_NON_ZERO($2a) LABEL($1a)
BRANCH_WHEN_NON_ZERO BRANCH LABEL ($1a): BRANCH_WHEN_ZERO($2a) LABEL($1a)
--
2.9.3
 
--- a/src/peep_engine.c 2014-05-01 08:28:45.000000000 +0200
+++ b/src/peep_engine.c 2016-09-29 23:43:05.238716680 +0200
@@ -4586,15 +4586,6 @@
}
break;
- case F_NEG_INT_INDEX:
- /* NEG_INT_INDEX [-$1a >= 0]: POS_INT_INDEX (-$1a) */
- if(-argument(0) >= 0)
- {
- do_optimization(1, 1, 2, F_POS_INT_INDEX, -argument(0), 0);
- return 1;
- }
- break;
-
case F_NEG_NUMBER:
/* NEG_NUMBER(1) : CONST_1 */
if((1)==argument(0))
@@ -4602,12 +4593,6 @@
do_optimization(1, 1, 1, F_CONST_1, 0);
return 1;
}
- /* NEG_NUMBER [(-$1a) >= 0] : NUMBER (-$1a) */
- if((-argument(0)) >= 0)
- {
- do_optimization(1, 1, 2, F_NUMBER, -argument(0), 0);
- return 1;
- }
break;
case F_NOP:
@@ -4652,12 +4637,6 @@
do_optimization(1, 1, 1, F_BIGNUM, 0);
return 1;
}
- /* NUMBER [(-$1a) > 0] : NEG_NUMBER (-$1a) */
- if((-argument(0)) > 0)
- {
- do_optimization(1, 1, 2, F_NEG_NUMBER, -argument(0), 0);
- return 1;
- }
break;
case F_POP_N_ELEMS:
@@ -4665,15 +4644,6 @@
return 1;
break;
- case F_POS_INT_INDEX:
- /* POS_INT_INDEX [$1a < 0]: NEG_INT_INDEX (-$1a) */
- if(argument(0) < 0)
- {
- do_optimization(1, 1, 2, F_NEG_INT_INDEX, -argument(0), 0);
- return 1;
- }
- break;
-
}
return 0;
}