commit fce80091da9e5d83d05944e36c834f9137dc329c
author Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 20 20:18:13 2012 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 20 20:18:13 2012 +0000
tree 806aa12aa45ef0fc71d8b8b9a4a281ad4634d9da
parent a03e40ce9d729fca50e817351e3b1b48691dcd64

Fix a use-after-free in thunk emission. EmitThunk may call RAUW on Init, invalidating the pointer.

Fixes PR12284. The test case only triggered under asan/valgrind, but it's better than nothing.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153120 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGVTables.cpp

diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp
index e262de1..17a0537 100644
--- a/lib/CodeGen/CGVTables.cpp
+++ b/lib/CodeGen/CGVTables.cpp
@@ -584,8 +584,8 @@
             VTableThunks[NextVTableThunkIndex].first == I) {
           const ThunkInfo &Thunk = VTableThunks[NextVTableThunkIndex].second;
         
-          Init = CGM.GetAddrOfThunk(GD, Thunk);
           MaybeEmitThunkAvailableExternally(GD, Thunk);
+          Init = CGM.GetAddrOfThunk(GD, Thunk);
 
           NextVTableThunkIndex++;
         } else {