From: David Given <dg@cowlark.com>
Date: Thu, 17 Mar 2016 21:30:24 +0000 (+0100)
Subject: Fix an insidious 64-bitness bug which was causing incorrectly optimised code.
X-Git-Tag: release-6-0-pre-5~5
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fd7e9f9046115683d9227264cfe86e394c9a0e36;p=ack.git

Fix an insidious 64-bitness bug which was causing incorrectly optimised code.

--HG--
branch : default-branch
---

diff --git a/util/opt/peephole.c b/util/opt/peephole.c
index 236fe1bda..ccce6a9c0 100644
--- a/util/opt/peephole.c
+++ b/util/opt/peephole.c
@@ -417,14 +417,14 @@ eval_t compute(pexp) register expr_p pexp; {
 	case EX_SFIT:
 		mask = 0;
 		for (i=leaf2.e_v.e_con - 1;i < 8*sizeof(offset); i++)
-			mask |= 1<<i;
+			mask |= ((offset)1)<<i;
 		res.e_v.e_con = (leaf1.e_v.e_con&mask) == 0 ||
 				       (leaf1.e_v.e_con&mask) == mask;
 		break;
 	case EX_UFIT:
 		mask = 0;
 		for (i=leaf2.e_v.e_con;i < 8*sizeof(offset); i++)
-			mask |= 1<<i;
+			mask |= ((offset)1)<<i;
 		res.e_v.e_con = (leaf1.e_v.e_con&mask) == 0;
 		break;
 	case EX_ROTATE: