Merging r155076:

------------------------------------------------------------------------
r155076 | rsmith | 2012-04-18 17:08:28 -0700 (Wed, 18 Apr 2012) | 6 lines

PR 12586: Fix assert while running libc++ testsuite: deal with exception
specifications on member function templates of class templates and other such
nested beasties. Store the function template from which we are to instantiate
an exception specification rather than trying to deduce it. Plus some
additional test cases.

------------------------------------------------------------------------

llvm-svn: 155079