replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix function type RTTI linkage and add tests. 

llvm-svn: 92266
This commit is contained in:
Anders Carlsson 2009-12-29 20:20:19 +00:00
parent 6b37c9e6fc
commit 26cf4ab8e2
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/CodeGen/CGRTTI.cpp
View File

@ -365,11 +365,10 @@ public:
case Type::Pointer:
case Type::MemberPointer:
return BuildTypeInfo(Ty);
case Type::FunctionProto:
case Type::FunctionNoProto:
return BuildSimpleType(Ty, "_ZTVN10__cxxabiv120__function_type_infoE");
return BuildTypeInfo(Ty);
case Type::ConstantArray:
case Type::IncompleteArray:
case Type::VariableArray:
@ -681,8 +680,13 @@ void RTTIBuilder::BuildVtablePointer(const Type *Ty) {
break;
case Type::MemberPointer:
// abi::__pointer_to_member_type_info
VtableName = "_ZTVN10__cxxabiv129__pointer_to_member_type_infoE";
VtableName = "_ZTVN10__cxxabiv129__pointer_to_member_type_infoE";
break;
case Type::FunctionNoProto:
case Type::FunctionProto:
// abi::__function_type_info
VtableName = "_ZTVN10__cxxabiv120__function_type_infoE";
}
llvm::Constant *Vtable =
@ -730,6 +734,12 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty) {
assert(false && "Builtin type info must be in the standard library!");
break;
case Type::FunctionNoProto:
case Type::FunctionProto:
// Itanium C++ ABI 2.9.5p4:
// abi::__function_type_info adds no data members to std::type_info;
break;
case Type::Record: {
const CXXRecordDecl *RD =
cast<CXXRecordDecl>(cast<RecordType>(Ty)->getDecl());

17
clang/test/CodeGenCXX/rtti-linkage.cpp
View File

@ -28,6 +28,15 @@
// CHECK: _ZTIN12_GLOBAL__N_11DE = internal constant
// CHECK: _ZTSPN12_GLOBAL__N_11DE = internal constant
// CHECK: _ZTIPN12_GLOBAL__N_11DE = internal constant
// CHECK: _ZTSFN12_GLOBAL__N_11DEvE = internal constant
// CHECK: _ZTIFN12_GLOBAL__N_11DEvE = internal constant
// CHECK: _ZTSFvN12_GLOBAL__N_11DEE = internal constant
// CHECK: _ZTIFvN12_GLOBAL__N_11DEE = internal constant
// CHECK: _ZTSPFvvE = weak_odr constant
// CHECK: _ZTSFvvE = weak_odr constant
// CHECK: _ZTIFvvE = weak_odr
// CHECK: _ZTIPFvvE = weak_odr constant
// A has no key function, so its RTTI data should be weak_odr.
struct A { };
@ -64,7 +73,13 @@ const D getD();
const std::type_info &t2() {
(void)typeid(const D);
(void)typeid(D *);
(void)typeid(D *);
(void)typeid(D (*)());
(void)typeid(void (*)(D));
// The exception specification is not part of the RTTI descriptor, so it should not have
// internal linkage.
(void)typeid(void (*)() throw (D));
// CHECK: _ZTIN12_GLOBAL__N_11DE to
return typeid(getD());
}