--- a/gcc/ada/gnatls.adb	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/ada/gnatls.adb	Thu Oct 25 07:37:49 2018 +0900
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2017, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2018, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -187,6 +187,7 @@
    --  Print usage message
 
    procedure Output_License_Information;
+   pragma No_Return (Output_License_Information);
    --  Output license statement, and if not found, output reference to COPYING
 
    function Image (Restriction : Restriction_Id) return String;
@@ -694,40 +695,38 @@
 
       procedure Output_Token (T : Token_Type) is
       begin
-         if T in T_No_ALI .. T_Flags then
-            for J in 1 .. N_Indents loop
-               Write_Str ("   ");
-            end loop;
-
-            Write_Str (Image (T).all);
-
-            for J in Image (T)'Length .. 12 loop
-               Write_Char (' ');
-            end loop;
-
-            Write_Str ("=>");
-
-            if T in T_No_ALI .. T_With then
-               Write_Eol;
-            elsif T in T_Source .. T_Name then
+         case T is
+            when T_No_ALI .. T_Flags =>
+               for J in 1 .. N_Indents loop
+                  Write_Str ("   ");
+               end loop;
+
+               Write_Str (Image (T).all);
+
+               for J in Image (T)'Length .. 12 loop
+                  Write_Char (' ');
+               end loop;
+
+               Write_Str ("=>");
+
+               if T in T_No_ALI .. T_With then
+                  Write_Eol;
+               elsif T in T_Source .. T_Name then
+                  Write_Char (' ');
+               end if;
+
+            when T_Preelaborated .. T_Body =>
+               if T in T_Preelaborated .. T_Is_Generic then
+                  if N_Flags = 0 then
+                     Output_Token (T_Flags);
+                  end if;
+
+                  N_Flags := N_Flags + 1;
+               end if;
+
                Write_Char (' ');
-            end if;
-
-         elsif T in T_Preelaborated .. T_Body then
-            if T in T_Preelaborated .. T_Is_Generic then
-               if N_Flags = 0 then
-                  Output_Token (T_Flags);
-               end if;
-
-               N_Flags := N_Flags + 1;
-            end if;
-
-            Write_Char (' ');
-            Write_Str  (Image (T).all);
-
-         else
-            Write_Str  (Image (T).all);
-         end if;
+               Write_Str  (Image (T).all);
+         end case;
       end Output_Token;
 
       -----------------