From 26887c69eb951420522c189cb7fa9a1b6c3c6898 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Fri, 19 Nov 2021 21:32:35 +0200 Subject: [PATCH] Remove check for `info func println` in debuginfotest After the merge of ee638aadb6201aa713e44c4865858a84f856d06e println(String) is being inlined in Java 17 and thus it can no longer be listed with `info func println`. Note that we already have a similar check that takes in account inlining and uses methods defined in the Hello test, so the removal of this check should be OK. (cherry picked from commit 1d548b069a719865d593342dd514b4dab91496cd) --- substratevm/mx.substratevm/testhello.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/substratevm/mx.substratevm/testhello.py b/substratevm/mx.substratevm/testhello.py index 32346d942bd3..e76fb61e94e6 100644 --- a/substratevm/mx.substratevm/testhello.py +++ b/substratevm/mx.substratevm/testhello.py @@ -287,17 +287,6 @@ def test(): checker = Checker("info func greet", rexp) checker.check(exec_string) - # look up PrintStream.println methods - # expect "All functions matching regular expression "java.io.PrintStream.println":" - # expect "" - # expect "File java.base/java/io/PrintStream.java:" - # expect " void java.io.PrintStream::println(java.lang.Object *);" - # expect " void java.io.PrintStream::println(java.lang.String *);" - exec_string = execute("info func java.io.PrintStream::println") - rexp = r"%svoid java.io.PrintStream::println\(java\.lang\.String \*\)"%maybe_spaces_pattern - checker = Checker("info func java.io.PrintStream::println", rexp) - checker.check(exec_string) - # step into method call execute("step") @@ -522,7 +511,8 @@ def test(): checker = Checker('ptype hello.Hello', rexp) checker.check(exec_string, skip_fails=False) - # list methods matching regural expression "nlined", inline methods are not listed + # list methods matching regural expression "nline", inline methods are not listed because they lack a definition + # (this is true for C/C++ as well) exec_string = execute("info func nline") rexp = [r"All functions matching regular expression \"nline\":", r"File hello/Hello\.java:",