diff options
| author | Stephen Lin <stephenwlin@gmail.com> | 2013-06-19 23:23:19 +0000 |
|---|---|---|
| committer | Stephen Lin <stephenwlin@gmail.com> | 2013-06-19 23:23:19 +0000 |
| commit | 19cee1871e3986c79a4408813f029121e896f11c (patch) | |
| tree | 48872934782f50a816db5a8af57dd8e002bce9ef /clang/lib/CodeGen/CGVTables.cpp | |
| parent | 11b3ba71760f219d92606f9b514c3869f7825a61 (diff) | |
| download | bcm5719-llvm-19cee1871e3986c79a4408813f029121e896f11c.tar.gz bcm5719-llvm-19cee1871e3986c79a4408813f029121e896f11c.zip | |
Revert r184205 and associated patches while investigating issue with broken buildbot (possible interaction with LTO)
<rdar://problem/14209661>
llvm-svn: 184384
Diffstat (limited to 'clang/lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 9c4a5e0cdad..e15639d31dd 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -287,9 +287,8 @@ void CodeGenFunction::GenerateThunk(llvm::Function *Fn, GlobalDecl GD, const ThunkInfo &Thunk) { const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl()); const FunctionProtoType *FPT = MD->getType()->getAs<FunctionProtoType>(); + QualType ResultType = FPT->getResultType(); QualType ThisType = MD->getThisType(getContext()); - QualType ResultType = - CGM.getCXXABI().HasThisReturn(GD) ? ThisType : FPT->getResultType(); FunctionArgList FunctionArgs; |
