From 092153e7ad1b945eb5ab3796952b64e1c0e07ec9 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Wed, 10 Feb 2010 21:08:54 +0000
Subject: [PATCH] * handle unrolling of for ... downto ... correctly, resolves
 #15668

git-svn-id: trunk@14884 -
---
 .gitattributes          |  1 +
 compiler/optloop.pas    | 10 +++++++---
 tests/webtbs/tw15668.pp | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 tests/webtbs/tw15668.pp

diff --git a/.gitattributes b/.gitattributes
index 0c05395d27..552eee0dad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10278,6 +10278,7 @@ tests/webtbs/tw15504.pp svneol=native#text/plain
 tests/webtbs/tw15530.pp svneol=native#text/pascal
 tests/webtbs/tw15607.pp svneol=native#text/plain
 tests/webtbs/tw15619.pp svneol=native#text/plain
+tests/webtbs/tw15668.pp svneol=native#text/pascal
 tests/webtbs/tw1567.pp svneol=native#text/plain
 tests/webtbs/tw15690.pp svneol=native#text/plain
 tests/webtbs/tw15693.pp svneol=native#text/plain
diff --git a/compiler/optloop.pas b/compiler/optloop.pas
index c535f49585..5eb0228fb0 100644
--- a/compiler/optloop.pas
+++ b/compiler/optloop.pas
@@ -127,9 +127,13 @@ unit optloop;
                     { for itself increases at the last iteration }
                     if i<unrolls then
                       begin
-                        { insert incrementation of counter var }
-                        addstatement(unrollstatement,
-                          geninlinenode(in_inc_x,false,ccallparanode.create(tfornode(node).left.getcopy,nil)));
+                        { insert incr/decrementation of counter var }
+                        if lnf_backward in tfornode(node).loopflags then
+                          addstatement(unrollstatement,
+                            geninlinenode(in_dec_x,false,ccallparanode.create(tfornode(node).left.getcopy,nil)))
+                        else
+                          addstatement(unrollstatement,
+                            geninlinenode(in_inc_x,false,ccallparanode.create(tfornode(node).left.getcopy,nil)));
                       end;
                   end;
                 { can we get rid of the for statement? }
diff --git a/tests/webtbs/tw15668.pp b/tests/webtbs/tw15668.pp
new file mode 100644
index 0000000000..8ba9426233
--- /dev/null
+++ b/tests/webtbs/tw15668.pp
@@ -0,0 +1,16 @@
+{ %OPT=-Ooloopunroll -O2 -S2 -Cr }
+const
+  StrArray :array[0..1] of string = ('s1','s2');
+
+function FindStr(const s :string) :Integer;
+var
+  i :Integer;
+begin
+  for i := High(StrArray) downto 0 do
+    if StrArray[i] = s then Exit(i);
+  Result := -1;
+end;
+
+begin
+  FindStr('s1');
+end.