diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-12-20 21:44:05 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-12-20 21:44:05 +0000 |
| commit | d2d1cc5156bd13b78d66e11f4b51fcc7dc4b52af (patch) | |
| tree | 35092fe2bb6d6561abb7bfa1ac3eeac2129d02c0 /clang/lib | |
| parent | f30e84843269388d30ad6cc9057d909afbbc33f2 (diff) | |
| download | bcm5719-llvm-d2d1cc5156bd13b78d66e11f4b51fcc7dc4b52af.tar.gz bcm5719-llvm-d2d1cc5156bd13b78d66e11f4b51fcc7dc4b52af.zip | |
Compare canonical return types when generating MS C++ ABI vtable thunks
This was part of the cause for PR17655. We were generating thunks when
we shouldn't have. I suspect that if we tweak the test case for PR17655
to actually require thunks, we can reproduce the same crash.
llvm-svn: 197836
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/VTableBuilder.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp index 5f7ae0f3ff4..63ac6f2c4a0 100644 --- a/clang/lib/AST/VTableBuilder.cpp +++ b/clang/lib/AST/VTableBuilder.cpp @@ -2888,7 +2888,8 @@ void VFTableBuilder::AddMethods(BaseSubobject Base, unsigned BaseDepth, AddThunk(MD, VTableThunks[OverriddenMethodInfo.VFTableIndex]); } - if (MD->getResultType() == OverriddenMD->getResultType()) { + if (Context.hasSameType(MD->getResultType(), + OverriddenMD->getResultType())) { // No return adjustment needed - just replace the overridden method info // with the current info. MethodInfo MI(OverriddenMethodInfo.VBTableIndex, |
