* fix finally block getting unconditionally removed if try-block is empty

(hasnocode(nil) always returns true). Regression from r48174

git-svn-id: trunk@49305 -

.gitattributes

@@ -18839,6 +18839,7 @@ tests/webtbs/tw38718.pp svneol=native#text/pascal
 tests/webtbs/tw38733.pp svneol=native#text/pascal
 tests/webtbs/tw38766.pp svneol=native#text/plain
 tests/webtbs/tw38802.pp svneol=native#text/pascal
+tests/webtbs/tw38833.pp svneol=native#text/plain
 tests/webtbs/tw3893.pp svneol=native#text/plain
 tests/webtbs/tw3898.pp svneol=native#text/plain
 tests/webtbs/tw3899.pp svneol=native#text/plain

compiler/nflw.pas

@@ -2734,10 +2734,10 @@ implementation
          begin
            result:=right;
            right:=nil;
-         end;
+         end
        { if the finally block contains no code, we can kill
          it and just return the try part }
-       if has_no_code(right) and not(assigned(third)) and not(implicitframe) then
+       else if has_no_code(right) and not(assigned(third)) and not(implicitframe) then
          begin
            result:=left;
            left:=nil;

tests/webtbs/tw38833.pp

@@ -0,0 +1,18 @@
+program EmptyTryFinally1;
+
+{$mode delphi}
+{$apptype console}
+
+var
+  finallyrun: boolean;
+begin
+  finallyrun:=false;
+  try
+   // Empty try statement block
+  finally
+    WriteLn('I should actually visible . . .'); // but I'm not
+    finallyrun:=true;
+  end;
+  if not finallyrun then
+    halt(1);
+end.