- reverted previous commit, committed in wrong checkout

git-svn-id: tags/release_2_6_4_rc1@26090 -

.gitattributes

@@ -12090,7 +12090,6 @@ tests/webtbs/tw23744.pp svneol=native#text/plain
 tests/webtbs/tw2377.pp svneol=native#text/plain
 tests/webtbs/tw2378.pp svneol=native#text/plain
 tests/webtbs/tw2382.pp svneol=native#text/plain
-tests/webtbs/tw23849.pp svneol=native#text/plain
 tests/webtbs/tw2388.pp svneol=native#text/plain
 tests/webtbs/tw2397.pp svneol=native#text/plain
 tests/webtbs/tw24007.pp svneol=native#text/plain

compiler/arm/narmmat.pas

@@ -64,14 +64,13 @@ implementation
       var
         power  : longint;
       begin
-        if not(cs_check_overflow in current_settings.localswitches) and
-           (right.nodetype=ordconstn) and
-           (nodetype=divn) and
-           (ispowerof2(tordconstnode(right).value,power) or
-            (tordconstnode(right).value=1) or
-            (tordconstnode(right).value=int64(-1))
-           ) and
-           not(is_64bitint(resultdef)) then
+        if (right.nodetype=ordconstn) and
+          (nodetype=divn) and
+          (ispowerof2(tordconstnode(right).value,power) or
+           (tordconstnode(right).value=1) or
+           (tordconstnode(right).value=int64(-1))
+          ) and
+          not(is_64bitint(resultdef)) then
           result:=nil
         else
           result:=inherited first_moddivint;

tests/webtbs/tw23849.pp

@@ -1,23 +0,0 @@
-{$mode delphi}
-{$q+}
-
-function F(N: integer) : integer;
-var NN : integer;
-begin
-    NN := N;
-    if NN < 0 then NN := 0 - NN;
-    result := NN;
-end;
-
-procedure Crash; cdecl;
-var
-    N, M : integer;
-begin
-    N := -10;
-    M := F(N) div 4;
-end;
-
-begin
-  Crash;
-end.
-