diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2011-03-20 21:35:39 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2011-03-20 21:35:39 +0000 |
| commit | e1d2584d446c459e19c076142ea5b8d483e0d733 (patch) | |
| tree | 53511f916b5318546e4a0e883c54755c79bcaf93 /clang/lib/CodeGen/CGRTTI.cpp | |
| parent | 6dc204de40f8c7e1a5992d1e62b34bc27429b484 (diff) | |
| download | bcm5719-llvm-e1d2584d446c459e19c076142ea5b8d483e0d733.tar.gz bcm5719-llvm-e1d2584d446c459e19c076142ea5b8d483e0d733.zip | |
Fix Objective-C++ exceptions (GNU runtime).
llvm-svn: 127980
Diffstat (limited to 'clang/lib/CodeGen/CGRTTI.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGRTTI.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp index 7ec0ee4b5ca..e276d98f12a 100644 --- a/clang/lib/CodeGen/CGRTTI.cpp +++ b/clang/lib/CodeGen/CGRTTI.cpp @@ -16,6 +16,7 @@ #include "clang/AST/RecordLayout.h" #include "clang/AST/Type.h" #include "clang/Frontend/CodeGenOptions.h" +#include "CGObjCRuntime.h" using namespace clang; using namespace CodeGen; @@ -977,6 +978,10 @@ llvm::Constant *CodeGenModule::GetAddrOfRTTIDescriptor(QualType Ty, const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext); return llvm::Constant::getNullValue(Int8PtrTy); } + + if (ForEH && Ty->isObjCObjectPointerType() && !Features.NeXTRuntime) { + return Runtime->GetEHType(Ty); + } return RTTIBuilder(*this).BuildTypeInfo(Ty); } |
