Reland r230314 "Fix codegen for virtual methods that are (re-) exported from multiple...
authorReid Kleckner <reid@kleckner.net>
Wed, 25 Feb 2015 02:19:56 +0000 (02:19 +0000)
committerReid Kleckner <reid@kleckner.net>
Wed, 25 Feb 2015 02:19:56 +0000 (02:19 +0000)
commit64b04b9bdf6f5dec2ebccd39195d8f216dad9ccb
treeecc82c9281f71fd61b9b4152264ff28e32f8ff22
parent7706f6a97b253b63643e550d8ad0802bd9352a4e
Reland r230314 "Fix codegen for virtual methods that are (re-) exported from multiple modules."

This reverts the revert from commit r230406.

The changes in r230445 and r230446 make the test pass on Windows now.

llvm-svn: 230448
clang/lib/AST/VTableBuilder.cpp
clang/test/Modules/Inputs/merge-vtable-codegen/a.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-vtable-codegen/b.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-vtable-codegen/c.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-vtable-codegen/merge-vtable-codegen.modulemap [new file with mode: 0644]
clang/test/Modules/merge-vtable-codegen.cpp [new file with mode: 0644]