commit 800ded68b5bc2c4c65cc22c2e0b36cc514a93c06
author Anders Carlsson <andersca@mac.com> Mon Mar 29 02:53:58 2010 +0000
committer Anders Carlsson <andersca@mac.com> Mon Mar 29 02:53:58 2010 +0000
tree 84af46a650e49cb8e9d5b52d70f83dc87707400f
parent 383f4cc8b9377db7456f7cf2bb2017feadd0a39a

Only add thunks for the most derived class. This fixes some link errors I was seeing in files generated by the vtable tester utility.

llvm-svn: 99801

clang/lib/CodeGen/CGVtable.cpp

diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 3322510..f44b7cc 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -1803,8 +1803,9 @@
             ComputeThisAdjustment(OverriddenMD, BaseOffsetInLayoutClass,
                                   Overrider);
 
-          if (ThisAdjustment.VCallOffsetOffset) {
-            // This is a virtual thunk, add it.
+          if (ThisAdjustment.VCallOffsetOffset &&
+              Overrider.Method->getParent() == MostDerivedClass) {
+            // This is a virtual thunk for the most derived class, add it.
             AddThunk(Overrider.Method, 
                      ThunkInfo(ThisAdjustment, ReturnAdjustment()));
           }