Index: test/Sema/template-specialization.cpp
===================================================================
--- test/Sema/template-specialization.cpp	(revision 0)
+++ test/Sema/template-specialization.cpp	(revision 0)
@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 -verify -fsyntax-only %s
+// Verify the absence of assertion failures when solving calls to unresolved
+// template member functions.
+
+struct A {
+  template <typename T>
+  static void bar(int) { } // expected-note {{candidate template ignored: couldn't infer template argument 'T'}}
+};
+
+struct B {
+  template <int i>
+  static void foo() {
+    int array[i];
+    A::template bar(array[0]); // expected-error {{no matching function for call to 'bar'}}
+  }
+};
+
+int main() {
+  B::foo<4>(); // expected-note {{in instantiation of function template specialization 'B::foo<4>'}}
+  return 0;
+}
Index: lib/Sema/TreeTransform.h
===================================================================
--- lib/Sema/TreeTransform.h	(revision 162214)
+++ lib/Sema/TreeTransform.h	(working copy)
@@ -7510,7 +7510,8 @@
   // If we have template arguments, rebuild them, then rebuild the
   // templateid expression.
   TemplateArgumentListInfo TransArgs(Old->getLAngleLoc(), Old->getRAngleLoc());
-  if (getDerived().TransformTemplateArguments(Old->getTemplateArgs(),
+  if (Old->hasExplicitTemplateArgs() &&
+      getDerived().TransformTemplateArguments(Old->getTemplateArgs(),
                                               Old->getNumTemplateArgs(),
                                               TransArgs))
     return ExprError();