commit 3f4336cb1f24ed0159f24cd96afbcd809c5d3d62
author Anders Carlsson <andersca@mac.com> Thu Dec 17 07:09:17 2009 +0000
committer Anders Carlsson <andersca@mac.com> Thu Dec 17 07:09:17 2009 +0000
tree 89a5790102166d52a4d5a85cdd3633588fa72625
parent 187220e3f591316f554cfc9bdd8c516ecf8c1e41

Rename GetAddrOfRTTI to GetAddrOfRTTIDescriptor. Remove the overload that takes a CXXRecordDecl since we were just creating a QualType from it anyway.

llvm-svn: 91590

clang/lib/CodeGen/CGException.cpp

diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp
index debebf2..caf0668 100644
--- a/clang/lib/CodeGen/CGException.cpp
+++ b/clang/lib/CodeGen/CGException.cpp
@@ -284,7 +284,7 @@
 
   // Now throw the exception.
   const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(getLLVMContext());
-  llvm::Constant *TypeInfo = CGM.GetAddrOfRTTI(ThrowType);
+  llvm::Constant *TypeInfo = CGM.GetAddrOfRTTIDescriptor(ThrowType);
   llvm::Constant *Dtor = llvm::Constant::getNullValue(Int8PtrTy);
 
   if (getInvokeDest()) {
@@ -367,7 +367,7 @@
 
   for (unsigned i = 0; i < Proto->getNumExceptions(); ++i) {
     QualType Ty = Proto->getExceptionType(i);
-    llvm::Value *EHType = CGM.GetAddrOfRTTI(Ty.getNonReferenceType());
+    llvm::Value *EHType = CGM.GetAddrOfRTTIDescriptor(Ty.getNonReferenceType());
     SelectorArgs.push_back(EHType);
   }
   if (Proto->getNumExceptions())
@@ -506,9 +506,9 @@
     const CXXCatchStmt *C = S.getHandler(i);
     VarDecl *CatchParam = C->getExceptionDecl();
     if (CatchParam) {
-      llvm::Value *EHType 
-        = CGM.GetAddrOfRTTI(C->getCaughtType().getNonReferenceType());
-      SelectorArgs.push_back(EHType);
+      llvm::Value *EHTypeInfo
+        = CGM.GetAddrOfRTTIDescriptor(C->getCaughtType().getNonReferenceType());
+      SelectorArgs.push_back(EHTypeInfo);
     } else {
       // null indicates catch all
       SelectorArgs.push_back(Null);