From 33fdad42d267ec2b156439c37bd867b611c18bee Mon Sep 17 00:00:00 2001
From: Nathan Henderson <nathan.t.henderson@outlook.com>
Date: Tue, 16 Apr 2024 09:04:37 -0700
Subject: [PATCH] Add j9protos.h to StringTable.hpp

This patch fixes a include-order dependency in StringTable.cpp.
StringTable.hpp relies on j9protos.h which it transitively has
access to through the include order in StringTable.cpp. This patch
includes j9protos.h explicitly in StringTable.hpp and alters
StringTable.cpp includes to conform to the OMR coding standards.

Signed-off-by: Nathan Henderson <nathan.henderson@ibm.com>
---
 runtime/gc_base/StringTable.cpp | 5 ++---
 runtime/gc_base/StringTable.hpp | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/gc_base/StringTable.cpp b/runtime/gc_base/StringTable.cpp
index 322aff37a7d..99e9f77cfd0 100644
--- a/runtime/gc_base/StringTable.cpp
+++ b/runtime/gc_base/StringTable.cpp
@@ -20,16 +20,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
+#include "StringTable.hpp"
+
 #include "hashtable_api.h"
 #include "j2sever.h"
 #include "j9consts.h"
-#include "j9protos.h"
 #include "objhelp.h"
-#include "ModronAssertions.h"
 
 #include "EnvironmentBase.hpp"
 #include "GCExtensions.hpp"
-#include "StringTable.hpp"
 #include "VMHelpers.hpp"
 
 /* the following is all zeros except the least significant bit */
diff --git a/runtime/gc_base/StringTable.hpp b/runtime/gc_base/StringTable.hpp
index d11c29956c7..c30c89be0d4 100644
--- a/runtime/gc_base/StringTable.hpp
+++ b/runtime/gc_base/StringTable.hpp
@@ -30,6 +30,7 @@
 
 #include "BaseVirtual.hpp"
 
+#include "j9protos.h"
 #include "ModronAssertions.h"
 
 class MM_EnvironmentBase;