1 files changed, 8 insertions, 3 deletions
diff --git a/lib/Sema/SemaTemplateVariadic.cpp b/lib/Sema/SemaTemplateVariadic.cpp
index 677b14635f..057792914b 100644
--- a/lib/Sema/SemaTemplateVariadic.cpp
+++ b/lib/Sema/SemaTemplateVariadic.cpp
@@ -103,9 +103,14 @@ namespace {
       return true;
     }
 
-    /// \brief Suppress traversal of declarations, since they cannot
-    /// contain unexpanded parameter packs.
-    bool TraverseDecl(Decl *D) { return true; }
+    /// \brief Suppress traversal of non-parameter declarations, since
+    /// they cannot contain unexpanded parameter packs.
+    bool TraverseDecl(Decl *D) { 
+      if (D && isa<ParmVarDecl>(D))
+        return inherited::TraverseDecl(D);
+
+      return true; 
+    }
   };
 }