diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 982fca8983d467c65bb5f28a869e2181fa33710e..51c69957635b6e8c5b177bc25f12e1e532aadf8d 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7428,12 +7428,14 @@ wrap_cleanups_r (tree *stmt_p, int *walk_subtrees, void *data)
       tree guard = (tree)data;
       tree tcleanup = TARGET_EXPR_CLEANUP (*stmt_p);
 
-      tcleanup = build2 (TRY_CATCH_EXPR, void_type_node, tcleanup, guard);
-      /* Tell honor_protect_cleanup_actions to handle this as a separate
-	 cleanup.  */
-      TRY_CATCH_IS_CLEANUP (tcleanup) = 1;
- 
-      TARGET_EXPR_CLEANUP (*stmt_p) = tcleanup;
+      if (tcleanup && !expr_noexcept_p (tcleanup, tf_none))
+	{
+	  tcleanup = build2 (TRY_CATCH_EXPR, void_type_node, tcleanup, guard);
+	  /* Tell honor_protect_cleanup_actions to handle this as a separate
+	     cleanup.  */
+	  TRY_CATCH_IS_CLEANUP (tcleanup) = 1;
+	  TARGET_EXPR_CLEANUP (*stmt_p) = tcleanup;
+	}
     }
 
   return NULL_TREE;
diff --git a/gcc/testsuite/g++.dg/eh/cleanup6.C b/gcc/testsuite/g++.dg/eh/cleanup6.C
new file mode 100644
index 0000000000000000000000000000000000000000..e27563f4569f9e25060273d8604ed25f6710d3e2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/cleanup6.C
@@ -0,0 +1,13 @@
+// Test that we don't wrap the non-throwing A cleanup with a B cleanup.
+
+// { dg-do compile { target c++11 } }
+// { dg-additional-options -fdump-tree-gimple }
+// { dg-final { scan-tree-dump-times "B::~B" 1 "gimple" } }
+
+struct A { A(); ~A(); };
+struct B { B(const A& = A()); ~B(); };
+
+int main()
+{
+  B b;
+}