diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 8a4ffaf..e99be90 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2503,6 +2503,9 @@
          i != DS->decl_end(); ++i) {
       if (VarDecl* D = dyn_cast<VarDecl>(*i)) {
         result |= D->getType()->isVariablyModifiedType();
+        result |= !!D->getAttr<CleanupAttr>();
+      } else if (TypedefDecl* D = dyn_cast<TypedefDecl>(*i)) {
+        result |= D->getUnderlyingType()->isVariablyModifiedType();
       }
     }
   }