Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	cache.cxx

1 files changed, 20 insertions, 0 deletions

diff --git a/testsuite/systemtap.context/uprobe_stmt_num.c b/testsuite/systemtap.context/uprobe_stmt_num.c
new file mode 100644
index 00000000..887e572a
--- /dev/null
+++ b/testsuite/systemtap.context/uprobe_stmt_num.c
@@ -0,0 +1,20 @@
+static int
+func2 (int x, int y)
+{
+  return x + y;
+}
+
+static int
+func (int arg)
+{
+  int x = 16;
+  int y = arg - x;
+  int z = func2(x, y);
+  return x + y + z;
+}
+
+int
+main (int argc, char *argv[], char *envp[])
+{
+  return func(42);
+}