1 files changed, 7 insertions, 9 deletions

diff --git a/lib/CodeGen/Mangle.h b/lib/CodeGen/Mangle.h
index 62656b95da1b..91a5e97b69c9 100644
--- a/lib/CodeGen/Mangle.h
+++ b/lib/CodeGen/Mangle.h
@@ -28,13 +28,14 @@ namespace clang {
   class ASTContext;
   class CXXConstructorDecl;
   class CXXDestructorDecl;
+  class CXXMethodDecl;
   class FunctionDecl;
   class NamedDecl;
   class VarDecl;
 
 namespace CodeGen {
-  class CovariantThunkAdjustment;
-  class ThunkAdjustment;
+  struct ThisAdjustment;
+  struct ThunkInfo;
 
 /// MangleBuffer - a convenient class for storing a name which is
 /// either the result of a mangling or is a constant string with
@@ -91,15 +92,12 @@ public:
   bool shouldMangleDeclName(const NamedDecl *D);
 
   void mangleName(const NamedDecl *D, llvm::SmallVectorImpl<char> &);
-  void mangleThunk(const FunctionDecl *FD, 
-                   const ThunkAdjustment &ThisAdjustment,
+  void mangleThunk(const CXXMethodDecl *MD,
+                   const ThunkInfo &Thunk,
                    llvm::SmallVectorImpl<char> &);
-  void mangleCXXDtorThunk(const CXXDestructorDecl *D, CXXDtorType Type,
-                          const ThunkAdjustment &ThisAdjustment,
+  void mangleCXXDtorThunk(const CXXDestructorDecl *DD, CXXDtorType Type,
+                          const ThisAdjustment &ThisAdjustment,
                           llvm::SmallVectorImpl<char> &);
-  void mangleCovariantThunk(const FunctionDecl *FD, 
-                            const CovariantThunkAdjustment& Adjustment,
-                            llvm::SmallVectorImpl<char> &);
   void mangleGuardVariable(const VarDecl *D, llvm::SmallVectorImpl<char> &);
   void mangleCXXVtable(const CXXRecordDecl *RD, llvm::SmallVectorImpl<char> &);
   void mangleCXXVTT(const CXXRecordDecl *RD, llvm::SmallVectorImpl<char> &);