Fix PR11094: JIT breakpoint is not properly recreated on reruns

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / jit-simple.exp

diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-simple.exp
index 6fe6011baa18a84e95785edbcf231ea2bcd56030..c1a079a67a8fe3354ec7736a9a9a563418756d98 100644 (file)
--- a/gdb/testsuite/gdb.base/jit-simple.exp
+++ b/gdb/testsuite/gdb.base/jit-simple.exp
@@ -13,6 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Test re-running an inferior with a JIT descriptor, where the JIT
+# descriptor changes address between runs.
+# http://sourceware.org/bugzilla/show_bug.cgi?id=13431
+
+# Test both the case of the JIT reader being included in the main
+# program directly, and the case of the JIT reader being split out to
+# a shared library.
+
+# For completeness, also test when the JIT descriptor does not change
+# address between runs.
+
 if {[skip_shlib_tests]} {
     untested jit-simple.exp
     return -1
@@ -20,25 +31,81 @@ if {[skip_shlib_tests]} {
 
 standard_testfile
 
-if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
+set libname $testfile-jit
+set srcfile_lib $srcdir/$subdir/$libname.c
+set binfile_lib [standard_output_file $libname.so]
+
+# Build a standalone JIT binary.
+
+proc build_standalone_jit {{options ""}} {
+    global testfile srcfile binfile
+
+    lappend options "debug"
+
+    if {[build_executable $testfile.exp $testfile $srcfile $options] == -1} {
+       return -1
+    }
+
+    return 0
+}
+
+# Build the shared library JIT.
+
+proc build_shared_jit {{options ""}} {
+    global testfile
+    global srcfile_lib binfile_lib
+
+    lappend options "debug additional_flags=-fPIC"
+    if { [gdb_compile_shlib $srcfile_lib $binfile_lib $options] != "" } {
+       return -1
+    }
+
+    return 0
+}
+
+if {[build_standalone_jit] == -1} {
+    untested "could not compile $binfile"
+    return
+}
+
+if {[build_shared_jit] == -1} {
+    untested "could not compile $binfile_lib"
+    return
+}
+
+# Built the program that loads the JIT library.
+set srcfile_dl $testfile-dl.c
+set binfile_dl $binfile-dl
+set options [list debug shlib=${binfile_lib}]
+if {[gdb_compile ${srcdir}/${subdir}/${srcfile_dl} $binfile_dl executable \
+        [list debug shlib=$binfile_lib]] == -1 } {
     untested jit-simple.exp
     return -1
 }
 
-# Test re-running an inferior with a JIT descriptor, where the JIT
-# descriptor changes address between runs.
-# http://sourceware.org/bugzilla/show_bug.cgi?id=13431
-proc jit_test_reread {} {
-    global testfile binfile subdir srcfile srcdir
+# STANDALONE is true when the JIT reader is included directly in the
+# main program.  False when the JIT reader is in a separate shared
+# library.  If CHANGE_ADDR is true, force changing the JIT descriptor
+# changes address between runs.
+proc jit_test_reread {standalone change_addr} {
+    global testfile binfile subdir srcfile srcdir binfile_lib binfile_dl
     global hex
 
     with_test_prefix "initial run" {
-       clean_restart $testfile
+       if {$standalone} {
+           clean_restart $binfile
+       } else {
+           clean_restart $binfile_dl
+       }
 
        runto_main
 
        set addr_before [get_hexadecimal_valueof "&__jit_debug_descriptor" 0 \
                             "get address of __jit_debug_descriptor"]
+
+       gdb_test "maint info breakpoints" \
+           "jit events     keep y   $hex <__jit_debug_register_code>.*" \
+           "maint info breakpoints shows jit breakpoint"
     }
 
     with_test_prefix "second run" {
@@ -47,21 +114,49 @@ proc jit_test_reread {} {
        # second, gdb might not reload the executable automatically.
        sleep 1
 
-       gdb_rename_execfile $binfile ${binfile}x
-       if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DSPACER}] != "" } {
-           fail "recompile"
-           return
-       } else {
-           pass "recompile"
+       if ${change_addr} {
+           set options "additional_flags=-DSPACER"
+           if {$standalone} {
+               gdb_rename_execfile $binfile ${binfile}x
+               set res [build_standalone_jit $options]
+           } else {
+               gdb_rename_execfile $binfile_lib ${binfile_lib}x
+               set res [build_shared_jit $options]
+           }
+           if  { $res == -1 } {
+               fail "recompile"
+               return
+           } else {
+               pass "recompile"
+           }
        }
 
        runto_main
 
        set addr_after [get_hexadecimal_valueof "&__jit_debug_descriptor" 0 \
                            "get address of __jit_debug_descriptor"]
+
+       # This used to crash in the JIT-in-shared-library case:
+       # https://sourceware.org/bugzilla/show_bug.cgi?id=11094
+       gdb_test "maint info breakpoints" \
+           "jit events     keep y   $hex <__jit_debug_register_code>.*" \
+           "maint info breakpoints shows jit breakpoint"
     }
 
-    gdb_assert {$addr_before != $addr_after} "address changed"
+    if ${change_addr} {
+       gdb_assert {$addr_before != $addr_after} "address changed"
+    } else {
+       gdb_assert {$addr_before == $addr_after} "address didn't change"
+    }
 }
 
-jit_test_reread
+foreach standalone {1 0} {
+    with_test_prefix [expr ($standalone)?"standalone":"shared"] {
+       with_test_prefix "change addr" {
+           jit_test_reread $standalone 1
+       }
+       with_test_prefix "same addr" {
+           jit_test_reread $standalone 0
+       }
+    }
+}