Integrated: 8349933: Mixing of includes and snippets stack causes the wrong -post snippet to be included

[Erik Joelsson]

On Wed, 12 Feb 2025 20:37:26 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The new framework for tracing makefile inclusion has a bug. In the Make[Include|Snippet]End.gmk files, the variables THIS_INCLUDE and THIS_SNIPPET respectively are restored from the HELPER_STACK variable. The problem is that we can't know if the next item on the stack is a previous "include" or "snippet". In a complex tree of includes/snippets, this can cause the wrong custom -post file to get included.
> 
> My proposed fix is to split HELPER_STACK into two variables, INCLUDE_STACK and SNIPPET_STACK, so we keep track of which files were includes and which ones were snippets. When printing indentations we just concatenate these variables to get the total stack size.
> 
> This patch fixes the observed issue for me locally. I'm running extensive testing on it.

This pull request has now been integrated.

Changeset: 16873732
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/16873732a752d79c3bf1bc450c63839997986d9e
Stats:     12 lines in 4 files changed: 0 ins; 0 del; 12 mod

8349933: Mixing of includes and snippets stack causes the wrong -post snippet to be included

Reviewed-by: ihse

-------------

PR: https://git.openjdk.org/jdk/pull/23601