8364037: Sort share includes: adlc, libadt, metaprogramming

Reviewed-by: ayang, chagedorn

Author: fandreuz

src/hotspot/share/adlc/adlc.hpp

@@ -29,14 +29,13 @@
 // Standard include file for ADLC parser
 //
 
+#include <ctype.h>
 // standard library constants
 #include <iostream>
-
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
 #include <sys/types.h>
 
 /* Make sure that we have the intptr_t and uintptr_t definitions */
@@ -86,14 +85,8 @@ typedef unsigned __int64 uintptr_t;
 
 // ADLC components
 #include "adlArena.hpp"
-#include "opto/adlcVMDeps.hpp"
-#include "filebuff.hpp"
-#include "dict2.hpp"
-#include "forms.hpp"
-#include "formsopt.hpp"
-#include "formssel.hpp"
-#include "archDesc.hpp"
 #include "adlparse.hpp"
+#include "archDesc.hpp"
 
 // globally define ArchDesc for convenience.  Alternatively every form
 // could have a backpointer to the AD but it's too complicated to pass

src/hotspot/share/adlc/adlparse.hpp

@@ -25,6 +25,11 @@
 #ifndef SHARE_ADLC_ADLPARSE_HPP
 #define SHARE_ADLC_ADLPARSE_HPP
 
+#include "filebuff.hpp"
+#include "forms.hpp"
+#include "formsopt.hpp"
+#include "formssel.hpp"
+
 // ADLPARSE.HPP - Definitions for Architecture Description Language Parser
 // Authors: Chris Vick and Mike Paleczny
 

src/hotspot/share/adlc/forms.hpp

@@ -25,6 +25,9 @@
 #ifndef SHARE_ADLC_FORMS_HPP
 #define SHARE_ADLC_FORMS_HPP
 
+#include "dict2.hpp"
+#include "opto/adlcVMDeps.hpp"
+
 // FORMS.HPP - ADL Parser Generic and Utility Forms Classes
 
 #define TRUE 1

src/hotspot/share/libadt/dict.cpp

@@ -29,8 +29,6 @@
 
 // %%%%% includes not needed with AVM framework - Ungar
 
-#include <assert.h>
-
 //------------------------------data-----------------------------------------
 // String hash tables
 #define MAXID 20

src/hotspot/share/metaprogramming/primitiveConversions.hpp

@@ -28,6 +28,7 @@
 #include "memory/allStatic.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <type_traits>
 
 class PrimitiveConversions : public AllStatic {

test/hotspot/jtreg/sources/TestIncludesAreSorted.java

@@ -43,10 +43,13 @@ public class TestIncludesAreSorted {
      * can be checked).
      */
     private static final String[] HOTSPOT_SOURCES_TO_CHECK = {
+                    "share/adlc",
                     "share/c1",
                     "share/ci",
                     "share/compiler",
                     "share/jvmci",
+                    "share/libadt",
+                    "share/metaprogramming",
                     "share/oops",
                     "share/opto",
                     "share/services",