From 97bccb2053ace210bc2139102281227fe9f31c86 Mon Sep 17 00:00:00 2001
From: Ekaterina Pavlova <epavlova@openjdk.org>
Date: Fri, 30 Nov 2018 23:46:20 -0800
Subject: [PATCH] 8214557: Filter out VM flags which don't affect AOT code
 generation

Reviewed-by: kvn, erikj
---
 make/RunTests.gmk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 29be126de3a..fe21aeaa5ff 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -135,9 +135,11 @@ define SetupAotModuleBody
     $1_LD := $$(LD)
   endif
 
+  # Create jaotc flags.
+  # VM flags which don't affect AOT code generation are filtered out: -Xcomp, -XX:+-TieredCompilation
   $1_JAOTC_OPTS := \
       -J-Xmx4g --info \
-      $$(addprefix -J, $$($1_VM_OPTIONS)) \
+      $$(addprefix -J, $$(filter-out -Xcomp %TieredCompilation, $$($1_VM_OPTIONS))) \
       $$(addprefix --compile-commands$(SPACE), $$($1_AOT_CCLIST)) \
       --linker-path $$($1_LD) \
       #