DebugInfo: Add test (in debuginfotest) for substituted methods

Author: zakkak

substratevm/mx.substratevm/suite.py

@@ -560,7 +560,7 @@
             "sourceDirs": ["src"],
             "dependencies": [
                 "mx:JUNIT_TOOL",
-                "sdk:GRAAL_SDK",
+                "SVM",
             ],
             "checkstyle": "com.oracle.svm.core",
             "workingSets": "SVM",
@@ -1129,7 +1129,7 @@
           ],
           "distDependencies": [
             "mx:JUNIT_TOOL",
-            "sdk:GRAAL_SDK",
+            "SVM",
           ],
           "testDistribution" : True,
         },

substratevm/mx.substratevm/testhello.py

@@ -158,6 +158,13 @@ def test():
                       ])
     checker.check(exec_string, skip_fails=False)
 
+    # set a break point at PrintStream::println(String)
+    # expect "Breakpoint 2 at 0x[0-9a-f]+: file hello/Target_Hello_DefaultGreeter.java, line [0-9]+."
+    exec_string = execute("break hello.Hello.DefaultGreeter::greet")
+    rexp = r"Breakpoint 2 at %s: file hello/Target_hello_Hello_DefaultGreeter\.java, line %s\."%(address_pattern, digits_pattern)
+    checker = Checker("break on substituted method", rexp)
+    checker.check(exec_string, skip_fails=False)
+
     # look up PrintStream::println methods
     # expect "All functions matching regular expression "java.io.PrintStream::println":"
     # expect ""
@@ -177,9 +184,9 @@ def test():
     checker.check(exec_string)
 
     # set a break point at PrintStream::println(String)
-    # expect "Breakpoint 2 at 0x[0-9a-f]+: java.base/java/io/PrintStream.java, line [0-9]+."
+    # expect "Breakpoint 3 at 0x[0-9a-f]+: java.base/java/io/PrintStream.java, line [0-9]+."
     exec_string = execute("break java.io.PrintStream::println(java.lang.String)")
-    rexp = r"Breakpoint 2 at %s: file .*java/io/PrintStream\.java, line %s\."%(address_pattern, digits_pattern)
+    rexp = r"Breakpoint 3 at %s: file .*java/io/PrintStream\.java, line %s\."%(address_pattern, digits_pattern)
     checker = Checker('break println', rexp)
     checker.check(exec_string, skip_fails=False)
 
@@ -221,7 +228,8 @@ def test():
         print(checker)
         sys.exit(1)
 
-    # continue to next breakpoint
+    # continue to next 2 breakpoints
+    execute("continue")
     execute("continue")
 
     # run backtrace to check we are in java.io.PrintStream::println(java.lang.String)

substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2020, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package hello;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(value = Hello.DefaultGreeter.class)
+final class Target_hello_Hello_DefaultGreeter {
+    @Substitute
+    public void greet() {
+        // Checkstyle: stop
+        System.out.println("Hello, substituted world!");
+        // Checkstyle: resume
+    }
+}