Merge "special" types from different modules in the AST reader.
authorDouglas Gregor <dgregor@apple.com>
Fri, 1 Feb 2013 23:45:03 +0000 (23:45 +0000)
committerDouglas Gregor <dgregor@apple.com>
Fri, 1 Feb 2013 23:45:03 +0000 (23:45 +0000)
commit44180f8f6d5d55ba69764bb8eb9d89aee0c4d5eb
treefb03a95d745f922b0b81f5fcedfae548ff71a185
parent6bade327dccc44ca8ab82ef5381441a390d97a9a
Merge "special" types from different modules in the AST reader.

Different modules may have different views of the various "special"
types in the AST, such as the redefinition type for "id". Merge those
types rather than only considering the redefinition types for the
first AST file loaded.

llvm-svn: 174234
clang/lib/Serialization/ASTReader.cpp
clang/test/Modules/Inputs/module.map
clang/test/Modules/Inputs/weird_objc.h [new file with mode: 0644]
clang/test/Modules/objc_redef.m [new file with mode: 0644]