mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-12 05:47:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup obsolete changes

Browse source
This commit is contained in:
Rainer Schuetze 2016-03-01 15:15:54 +01:00 • committed by Martin
parent 1f41496326
commit 03e7834a49
6 changed files with 6 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

85
gen/ms-cxx-helper.cpp
View file

@ -110,11 +110,10 @@ void cloneBlocks(const std::vector<llvm::BasicBlock *> &srcblocks,
CInst, llvm::OperandBundleDef("funclet", funclet));
call->setIsNoInline();
newInst = call;
} else if (funclet && llvm::isa<llvm::UnreachableInst>(Inst)) {
newInst = llvm::BranchInst::Create(continueWith); // to cleanupret
}
}
if (funclet && llvm::isa<llvm::UnreachableInst>(Inst)) {
newInst = llvm::BranchInst::Create(continueWith); // cleanupret
}
if (!newInst)
newInst = Inst->clone();
@ -140,7 +139,7 @@ bool isCatchSwitchBlock(llvm::BasicBlock* bb) {
// copy from clang/.../MicrosoftCXXABI.cpp
// 5 routines for constructing the llvm types for MS RTTI structs.
// routines for constructing the llvm types for MS RTTI structs.
llvm::StructType *getTypeDescriptorType(IRState &irs,
llvm::Constant *classInfoPtr,
llvm::StringRef TypeInfoString) {
@ -187,82 +186,4 @@ llvm::GlobalVariable *getTypeDescriptor(IRState &irs, ClassDeclaration *cd) {
return Var;
}
#if 0
// currently unused, information built at runtime ATM
llvm::StructType *BaseClassDescriptorType;
llvm::StructType *ClassHierarchyDescriptorType;
llvm::StructType *CompleteObjectLocatorType;
bool isImageRelative() {
return global.params.targetTriple.isArch64Bit();
}
llvm::Type *getImageRelativeType(llvm::Type *PtrType) {
if (!isImageRelative())
return PtrType;
return LLType::getInt32Ty(gIR->context());
}
llvm::StructType *getClassHierarchyDescriptorType();
llvm::StructType *getBaseClassDescriptorType() {
if (BaseClassDescriptorType)
return BaseClassDescriptorType;
auto intTy = LLType::getInt32Ty(gIR->context());
auto int8Ty = LLType::getInt8Ty(gIR->context());
llvm::Type *FieldTypes[] = {
getImageRelativeType(getPtrToType(int8Ty)),
intTy,
intTy,
intTy,
intTy,
intTy,
getImageRelativeType(getClassHierarchyDescriptorType()->getPointerTo()),
};
BaseClassDescriptorType = llvm::StructType::create(
gIR->context(), FieldTypes, "rtti.BaseClassDescriptor");
return BaseClassDescriptorType;
}
llvm::StructType *getClassHierarchyDescriptorType() {
if (ClassHierarchyDescriptorType)
return ClassHierarchyDescriptorType;
// Forward-declare RTTIClassHierarchyDescriptor to break a cycle.
ClassHierarchyDescriptorType = llvm::StructType::create(
gIR->context(), "rtti.ClassHierarchyDescriptor");
auto intTy = LLType::getInt32Ty(gIR->context());
llvm::Type *FieldTypes[] = {
intTy,
intTy,
intTy,
getImageRelativeType(
getBaseClassDescriptorType()->getPointerTo()->getPointerTo()),
};
ClassHierarchyDescriptorType->setBody(FieldTypes);
return ClassHierarchyDescriptorType;
}
llvm::StructType *getCompleteObjectLocatorType() {
if (CompleteObjectLocatorType)
return CompleteObjectLocatorType;
CompleteObjectLocatorType = llvm::StructType::create(
gIR->context(), "rtti.CompleteObjectLocator");
auto intTy = LLType::getInt32Ty(gIR->context());
auto int8Ty = LLType::getInt8Ty(gIR->context());
llvm::Type *FieldTypes[] = {
intTy,
intTy,
intTy,
getImageRelativeType(getPtrToType(int8Ty)),
getImageRelativeType(getClassHierarchyDescriptorType()->getPointerTo()),
getImageRelativeType(CompleteObjectLocatorType),
};
llvm::ArrayRef<llvm::Type *> FieldTypesRef(FieldTypes);
if (!isImageRelative())
FieldTypesRef = FieldTypesRef.drop_back();
CompleteObjectLocatorType->setBody(FieldTypesRef);
return CompleteObjectLocatorType;
}
#endif
#endif // LDC_LLVM_VER >= 308