Add testcase for PR10533 (inlined vars) and 10537 (inlined labels - disabled)

Partial testcase for PR10533 (inlined vars) and 10537 (inlined labels)
currently we cannot use the full testcase since stap doesn't support
probing multiple instances of inlined labels.

* testsuite/systemtap.base/inlinedvars.exp: New file.
* testsuite/systemtap.base/inlinedvars.stp: Likewise.
* testsuite/systemtap.base/inlinedvars.c: Likewise.

3 files changed, 73 insertions, 0 deletions

diff --git a/testsuite/systemtap.base/inlinedvars.c b/testsuite/systemtap.base/inlinedvars.c
new file mode 100644
index 00000000..2756323e
--- /dev/null
+++ b/testsuite/systemtap.base/inlinedvars.c
@@ -0,0 +1,43 @@
+static inline int
+m(char *name, int i, long j)
+{
+  // Random syntactical block to be inlined.
+  // Mimics what STAP_PROBE macro does a bit.
+  do {
+    volatile __typeof__(name) p_name = name;
+    volatile __typeof__(i) p_i = i;
+    volatile __typeof__(j) p_j = j;
+    // empty asm to force locals into regs.
+    inlined_label: asm volatile ("" :: "g"(p_name), "g"(p_i), "g"(p_j));
+  } while (0);
+  return i + 32;
+}
+
+/* XXX PR10537 label() doesn't select multiple instances.
+static inline int
+call(int pi, long pj)
+{
+  volatile ic = pi - 42;
+  volatile jc = pj + 42;
+  return m("call", ic, jc);
+}
+
+static inline int
+call2(int pi2, long pj2)
+{
+  volatile ic2 = pi2 + 64;
+  volatile jc2 = pj2 - 64;
+  return m("call2", ic2, jc2);
+}
+*/
+
+int
+main (int argc, char **argv)
+{
+  volatile int i = 64;
+  volatile long j = 42;
+  i = 54;// XXX PR10537 call(i, j);
+  j = 150; // XXX PR10537 call2(i, j);
+  m("main", i, j);
+  return 0;
+}
diff --git a/testsuite/systemtap.base/inlinedvars.exp b/testsuite/systemtap.base/inlinedvars.exp
new file mode 100644
index 00000000..95950110
--- /dev/null
+++ b/testsuite/systemtap.base/inlinedvars.exp
@@ -0,0 +1,26 @@
+set test "inlinedvars"
+# XXX PR10537 - so only one result for now.
+#set ::result_string {call (22,84)
+#call2 (118,-22)
+#main (54,150)}
+set ::result_string {main (54,150)}
+
+set test_flags "additional_flags=-g"
+set test_flags "$test_flags additional_flags=-O2"
+
+set res [target_compile $srcdir/$subdir/$test.c $test.exe executable "$test_flags"]
+if { $res != "" } {
+    verbose "target_compile failed: $res" 2
+    fail "compiling $test.c"
+    untested "$test.c compile"
+    continue
+} else {
+    pass "$test.c compile"
+}
+
+if {[installtest_p] && [uprobes_p]} {
+  stap_run3 "$test" $srcdir/$subdir/$test.stp $test.exe -c ./$test.exe
+} else {
+  untested "$test"
+}
+#catch {exec rm -f $test.exe}
diff --git a/testsuite/systemtap.base/inlinedvars.stp b/testsuite/systemtap.base/inlinedvars.stp
new file mode 100644
index 00000000..e3aafbe6
--- /dev/null
+++ b/testsuite/systemtap.base/inlinedvars.stp
@@ -0,0 +1,4 @@
+probe process("inlinedvars.exe").function("m").label("inlined_label")
+{
+  printf("%s (%d,%d)\n", user_string($p_name), $p_i, $p_j);
+}