diff --git a/regression/goto-instrument-typedef/typedef-anon-struct1/main.c b/regression/goto-instrument-typedef/typedef-anon-struct1/main.c
new file mode 100644
index 0000000000..d1e7196a3b
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-anon-struct1/main.c
@@ -0,0 +1,11 @@
+
+typedef struct
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+void fun()
+{
+  MYSTRUCT mystruct_var = {.x = 3, .y = 2.1f};
+}
diff --git a/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc
new file mode 100644
index 0000000000..59aba0e01a
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-anon-struct1/test.desc
@@ -0,0 +1,10 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-param-anon-struct1/main.c b/regression/goto-instrument-typedef/typedef-param-anon-struct1/main.c
new file mode 100644
index 0000000000..e8f3fb8fd7
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-anon-struct1/main.c
@@ -0,0 +1,11 @@
+
+typedef struct
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+void fun(MYSTRUCT mystruct_param)
+{
+
+}
diff --git a/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc
new file mode 100644
index 0000000000..537526b442
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-anon-struct1/test.desc
@@ -0,0 +1,10 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-param-struct1/main.c b/regression/goto-instrument-typedef/typedef-param-struct1/main.c
new file mode 100644
index 0000000000..a358c15a03
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-struct1/main.c
@@ -0,0 +1,10 @@
+
+typedef struct tag_struct_name
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+void fun(struct tag_struct_name tag_struct_param, MYSTRUCT mystruct_param)
+{
+}
diff --git a/regression/goto-instrument-typedef/typedef-param-struct1/test.desc b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc
new file mode 100644
index 0000000000..c26ee45845
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-struct1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: tag_struct_param\nMode\.+: C\nType\.+: struct tag_struct_name
+Base name\.+: mystruct_param\nMode\.+: C\nType\.+: MYSTRUCT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-param-type1/main.c b/regression/goto-instrument-typedef/typedef-param-type1/main.c
new file mode 100644
index 0000000000..b4c915066b
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type1/main.c
@@ -0,0 +1,7 @@
+
+typedef int MYINT;
+
+void fun(int int_param, MYINT myint_param)
+{
+
+}
diff --git a/regression/goto-instrument-typedef/typedef-param-type1/test.desc b/regression/goto-instrument-typedef/typedef-param-type1/test.desc
new file mode 100644
index 0000000000..050ac22b31
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: int_param\nMode\.+: C\nType\.+: signed int
+Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-param-type2/main.c b/regression/goto-instrument-typedef/typedef-param-type2/main.c
new file mode 100644
index 0000000000..b5974fb6bb
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type2/main.c
@@ -0,0 +1,8 @@
+
+typedef int MYINT;
+typedef int ALTINT;
+
+void fun(int int_param, MYINT myint_param, ALTINT altint_param)
+{
+
+}
diff --git a/regression/goto-instrument-typedef/typedef-param-type2/test.desc b/regression/goto-instrument-typedef/typedef-param-type2/test.desc
new file mode 100644
index 0000000000..53cdc42193
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type2/test.desc
@@ -0,0 +1,12 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: int_param\nMode\.+: C\nType\.+: signed int
+Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT
+Base name\.+: altint_param\nMode\.+: C\nType\.+: ALTINT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-param-type3/main.c b/regression/goto-instrument-typedef/typedef-param-type3/main.c
new file mode 100644
index 0000000000..4d542e10c1
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type3/main.c
@@ -0,0 +1,7 @@
+
+typedef int MYINT;
+typedef MYINT CHAINEDINT;
+
+void fun(int int_param, MYINT myint_param, CHAINEDINT chainedint_param)
+{
+}
diff --git a/regression/goto-instrument-typedef/typedef-param-type3/test.desc b/regression/goto-instrument-typedef/typedef-param-type3/test.desc
new file mode 100644
index 0000000000..6ba9d61f8c
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-param-type3/test.desc
@@ -0,0 +1,12 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: int_param\nMode\.+: C\nType\.+: signed int
+Base name\.+: myint_param\nMode\.+: C\nType\.+: MYINT
+Base name\.+: chainedint_param\nMode\.+: C\nType\.+: CHAINEDINT
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-return-anon-struct1/main.c b/regression/goto-instrument-typedef/typedef-return-anon-struct1/main.c
new file mode 100644
index 0000000000..0195b955cd
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-anon-struct1/main.c
@@ -0,0 +1,12 @@
+
+typedef struct
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+MYSTRUCT fun()
+{
+  MYSTRUCT return_variable = {.x = 1, .y = 3.14f};
+  return return_variable;
+}
diff --git a/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc
new file mode 100644
index 0000000000..47964f71f6
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-anon-struct1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: return\nMode\.+: C\nType\.+: MYSTRUCT
+Base name\.+: fun\nMode\.+: C\nType\.+: MYSTRUCT \(\)
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-return-struct1/main.c b/regression/goto-instrument-typedef/typedef-return-struct1/main.c
new file mode 100644
index 0000000000..30c1323555
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-struct1/main.c
@@ -0,0 +1,20 @@
+
+typedef struct tag_struct_name
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+struct tag_struct_name fun()
+{
+  struct tag_struct_name return_variable = { .x = 1, .y = 3.14f};
+  return return_variable;
+}
+
+MYSTRUCT fun2()
+{
+  MYSTRUCT return_variable = { .x = 1, .y = 3.14f};
+  return return_variable;
+}
+
+
diff --git a/regression/goto-instrument-typedef/typedef-return-struct1/test.desc b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc
new file mode 100644
index 0000000000..eade5942ac
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-struct1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: fun\nMode\.+: C\nType\.+: struct tag_struct_name \(\)
+Base name\.+: fun2\nMode\.+: C\nType\.+: MYSTRUCT \(\)
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-return-type1/main.c b/regression/goto-instrument-typedef/typedef-return-type1/main.c
new file mode 100644
index 0000000000..1ba7f426f8
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type1/main.c
@@ -0,0 +1,12 @@
+
+typedef int MYINT;
+
+int fun()
+{
+  return 4;
+}
+
+MYINT fun2()
+{
+  return 5;
+}
diff --git a/regression/goto-instrument-typedef/typedef-return-type1/test.desc b/regression/goto-instrument-typedef/typedef-return-type1/test.desc
new file mode 100644
index 0000000000..ba1b96ce6b
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: fun\nMode\.+: C\nType\.+: signed int \(\)
+Base name\.+: fun2\nMode\.+: C\nType\.+: MYINT \(\)
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-return-type2/main.c b/regression/goto-instrument-typedef/typedef-return-type2/main.c
new file mode 100644
index 0000000000..0d94ab54da
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type2/main.c
@@ -0,0 +1,13 @@
+
+typedef int MYINT;
+typedef int ALTINT;
+
+MYINT fun()
+{
+
+}
+
+ALTINT fun2()
+{
+
+}
diff --git a/regression/goto-instrument-typedef/typedef-return-type2/test.desc b/regression/goto-instrument-typedef/typedef-return-type2/test.desc
new file mode 100644
index 0000000000..1ecc9ea8e9
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type2/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\)
+Base name\.+: fun2\nMode\.+: C\nType\.+: ALTINT \(\)
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-return-type3/main.c b/regression/goto-instrument-typedef/typedef-return-type3/main.c
new file mode 100644
index 0000000000..e246757c69
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type3/main.c
@@ -0,0 +1,12 @@
+
+typedef int MYINT;
+typedef MYINT CHAINEDINT;
+
+MYINT fun()
+{
+}
+
+CHAINEDINT fun2()
+{
+
+}
\ No newline at end of file
diff --git a/regression/goto-instrument-typedef/typedef-return-type3/test.desc b/regression/goto-instrument-typedef/typedef-return-type3/test.desc
new file mode 100644
index 0000000000..2401af3ce8
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-return-type3/test.desc
@@ -0,0 +1,10 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+Base name\.+: fun\nMode\.+: C\nType\.+: MYINT \(\)
+Base name\.+: fun2\nMode\.+: C\nType\.+: CHAINEDINT \(\)
+--
+warning: ignoring
diff --git a/regression/goto-instrument-typedef/typedef-struct1/main.c b/regression/goto-instrument-typedef/typedef-struct1/main.c
new file mode 100644
index 0000000000..dac5abf77b
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-struct1/main.c
@@ -0,0 +1,12 @@
+
+typedef struct tag_struct_name
+{
+  int x;
+  float y;
+} MYSTRUCT;
+
+void fun()
+{
+  struct tag_struct_name tag_struct_var = {.x = 1, .y = 3.14f};
+  MYSTRUCT mystruct_var = {.x = 3, .y = 2.1f};
+}
diff --git a/regression/goto-instrument-typedef/typedef-struct1/test.desc b/regression/goto-instrument-typedef/typedef-struct1/test.desc
new file mode 100644
index 0000000000..6a02f2d217
--- /dev/null
+++ b/regression/goto-instrument-typedef/typedef-struct1/test.desc
@@ -0,0 +1,11 @@
+CORE
+main.c
+"--show-symbol-table"
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+Base name\.+: tag_struct_var\nMode\.+: C\nType\.+: struct tag_struct_name
+Base name\.+: mystruct_var\nMode\.+: C\nType\.+: MYSTRUCT
+--
+warning: ignoring