During the review of JDK-8367320 we stumbled on the lack of a clear indication of what constitutes the "corresponding .hpp" file for a .inline.hpp file having an architecture qualifier.

For example, "continuationHelper_x86.inline.hpp" includes "runtime/continuationHelper.hpp", and the include statement is on top as stated in the style guide:

#ifndef CPU_X86_CONTINUATIONHELPER_X86_INLINE_HPP
#define CPU_X86_CONTINUATIONHELPER_X86_INLINE_HPP

#include "runtime/continuationHelper.hpp"

#include "runtime/continuationEntry.inline.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/registerMap.hpp"
[...]

However, this order is not respected by SortIncludes.java, which does not designate "runtime/continuationHelper.hpp" as the "corresponding .hpp file". If this concept was clarified in the style guide, we could improve SortIncludes accordingly.

I attached the output of "find src/hotspot -type f -regex '.*_.*.inline.hpp'".