Revert r300653 and r300650. The underlying commit fixes one issue with
authorChandler Carruth <chandlerc@gmail.com>
Wed, 19 Apr 2017 05:25:13 +0000 (05:25 +0000)
committerChandler Carruth <chandlerc@gmail.com>
Wed, 19 Apr 2017 05:25:13 +0000 (05:25 +0000)
commitbd186c0787844f4d9111e5a918c457ad9e830e8c
treee905edadea2e5376a0d8537d72f8f62762319ef4
parent73daaa8fb25385d4b664a3e174985b08b4b3db59
Revert r300653 and r300650. The underlying commit fixes one issue with
modules but exposes much more widespread issues. Example and more
information is on the review thread for r300650.

Original commit summary:
[modules] Properly look up the owning module for an instantiation of a merged template.

llvm-svn: 300659
clang/lib/AST/Decl.cpp
clang/lib/AST/DeclCXX.cpp
clang/lib/Sema/SemaLookup.cpp
clang/test/Modules/Inputs/template-default-args/a.h
clang/test/Modules/template-default-args.cpp