Patchwork C++ PATCH for c++/51137

login
register
mail settings
Submitter Jason Merrill
Date Nov. 17, 2011, 3:40 p.m.
Message ID <4EC52AEE.2050002@redhat.com>
Download mbox | patch
Permalink /patch/126254/
State New
Headers show

Comments

Jason Merrill - Nov. 17, 2011, 3:40 p.m.
My patch for 51029 fixed some virtual calls under 
fold_non_dependent_expr, but clearly not all.  This patch goes farther.

Tested x86_64-pc-linux-gnu, applying to trunk.

Patch

commit 9c6ea6fd08c5c99ba4455b88bb8d0b0b6a71d171
Author: Jason Merrill <jason@redhat.com>
Date:   Tue Nov 15 14:27:04 2011 -0500

    	PR c++/51137
    	* class.c (build_base_path): Don't do calculation in templates.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4a291ac..0765817 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -304,8 +304,13 @@  build_base_path (enum tree_code code,
   virtual_access = (v_binfo && fixed_type_p <= 0);
 
   /* Don't bother with the calculations inside sizeof; they'll ICE if the
-     source type is incomplete and the pointer value doesn't matter.  */
-  if (cp_unevaluated_operand != 0)
+     source type is incomplete and the pointer value doesn't matter.  In a
+     template (even in fold_non_dependent_expr), we don't have vtables set
+     up properly yet, and the value doesn't matter there either; we're just
+     interested in the result of overload resolution.  */
+  if (cp_unevaluated_operand != 0
+      || (current_function_decl
+	  && uses_template_parms (current_function_decl)))
     {
       expr = build_nop (ptr_target_type, expr);
       if (!want_pointer)
@@ -359,11 +364,6 @@  build_base_path (enum tree_code code,
 	 V_BINFO.  That offset is an entry in D_BINFO's vtable.  */
       tree v_offset;
 
-      /* In a constructor template, current_in_charge_parm isn't set,
-	 and we might end up here via fold_non_dependent_expr.  */
-      if (fixed_type_p < 0 && !(cfun && current_in_charge_parm))
-	fixed_type_p = 0;
-
       if (fixed_type_p < 0 && in_base_initializer)
 	{
 	  /* In a base member initializer, we cannot rely on the
diff --git a/gcc/testsuite/g++.dg/template/virtual2.C b/gcc/testsuite/g++.dg/template/virtual2.C
new file mode 100644
index 0000000..83b7ed6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/virtual2.C
@@ -0,0 +1,11 @@ 
+// PR c++/51137
+
+struct A {};
+
+template<int> struct B : virtual A
+{
+  void foo()
+  {
+    (new A(*this))->A::~A();
+  }
+};