@@ -1381,6 +1381,10 @@ assemble_thunk (struct cgraph_node *node)
init_function_start (thunk_fndecl);
cfun->is_thunk = 1;
assemble_start_function (thunk_fndecl, fnname);
+ (*debug_hooks->source_line) (DECL_SOURCE_LINE (thunk_fndecl),
+ DECL_SOURCE_FILE (thunk_fndecl),
+ /* discriminator */ 0,
+ /* is_stmt */ 1);
targetm.asm_out.output_mi_thunk (asm_out_file, thunk_fndecl,
fixed_offset, virtual_value, alias);
@@ -1863,11 +1863,13 @@ final (rtx first, FILE *file, int optimize_p)
start_to_bb = XCNEWVEC (basic_block, bb_map_size);
end_to_bb = XCNEWVEC (basic_block, bb_map_size);
- FOR_EACH_BB_REVERSE (bb)
- {
- start_to_bb[INSN_UID (BB_HEAD (bb))] = bb;
- end_to_bb[INSN_UID (BB_END (bb))] = bb;
- }
+ /* There is no cfg for a thunk. */
+ if (!cfun->is_thunk)
+ FOR_EACH_BB_REVERSE (bb)
+ {
+ start_to_bb[INSN_UID (BB_HEAD (bb))] = bb;
+ end_to_bb[INSN_UID (BB_END (bb))] = bb;
+ }
}
/* Output the insns. */
b/gcc/testsuite/g++.dg/debug/dwar
new file mode 100644
@@ -0,0 +1,39 @@
+// { dg-do compile }
+// { dg-options "-g2 -dA" }
+
+// Verify that line number info is output for the non-virtual
+// thunks for C::~C().
+// { dg-final { scan-assembler "thunk.C:30" } }
+
+class A
+{
+ public:
+ A();
+ virtual ~A();
+ private:
+ int i;
+};
+
+class B
+{
+ public:
+ B();
+ virtual ~B();
+ private:
+ int i;
+};
+
+class C : public A, public B
+{
+ public:
+ C();
+ virtual ~C(); // line 30
+};
+
+C::C()
+{
+}
+
+C::~C()
+{
+}