[modules] Fix a few places where merging wasn't performed if modules was disabled...
authorRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 11 Jun 2015 03:05:39 +0000 (03:05 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 11 Jun 2015 03:05:39 +0000 (03:05 +0000)
commit00be6d0ff86a5328c13f3f88171b26097c8ed664
treed302511800ab41e53edcaf85dbbba82b492e00d0
parent9321f926b01bfba21fa2524d916b889f280bae8e
[modules] Fix a few places where merging wasn't performed if modules was disabled but local module visibilty was enabled.

llvm-svn: 239504
clang/lib/Sema/SemaDecl.cpp
clang/lib/Sema/SemaType.cpp
clang/test/Modules/Inputs/submodules-merge-defs/defs.h
clang/test/Modules/Inputs/submodules-merge-defs/indirect.h [new file with mode: 0644]
clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap
clang/test/Modules/submodules-merge-defs.cpp