diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 578299ef0e2..839042e48c6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-15  Martin Liska  <mliska@suse.cz>
+
+	* decl.c (begin_destructor_body): Use cp_build_fold_indirect_ref
+	instead of cp_build_indirect_ref.
+
 2017-11-15  Martin Liska  <mliska@suse.cz>
 
 	* decl.c (begin_destructor_body): In case of VPTR sanitization
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 041893db937..7e16f7b415b 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -15253,8 +15253,7 @@ begin_destructor_body (void)
 	  {
 	    tree binfo = TYPE_BINFO (current_class_type);
 	    tree ref
-	      = cp_build_indirect_ref (current_class_ptr, RO_NULL,
-				       tf_warning_or_error);
+	      = cp_build_fold_indirect_ref (current_class_ptr);
 
 	    tree vtbl_ptr = build_vfield_ref (ref, TREE_TYPE (binfo));
 	    tree vtbl = build_zero_cst (TREE_TYPE (vtbl_ptr));