cleanup obsolete changes

gen/attributes.cpp

@@ -29,11 +29,6 @@ AttrBuilder &AttrBuilder::add(LLAttribute attribute) {
   return *this;
 }
 
-AttrBuilder &AttrBuilder::add(llvm::StringRef A, llvm::StringRef V) {
-  builder.addAttribute(A, V);
-  return *this;
-}
-
 AttrBuilder &AttrBuilder::remove(LLAttribute attribute) {
   // never remove 'None' explicitly
   if (attribute) {

gen/attributes.h

@@ -27,7 +27,6 @@ public:
   AttrBuilder &add(LLAttribute attribute);
   AttrBuilder &remove(LLAttribute attribute);
   AttrBuilder &merge(const AttrBuilder &other);
-  AttrBuilder &add(llvm::StringRef A, llvm::StringRef V = llvm::StringRef());
 
   AttrBuilder &addAlignment(unsigned alignment);
   AttrBuilder &addByVal(unsigned alignment);

gen/ms-cxx-helper.cpp

@@ -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

gen/statements.cpp

@@ -776,9 +776,6 @@ public:
       exnObj = cpyObj;
     }
 
-    auto enterCatchFn =
-        getRuntimeFunction(Loc(), irs->module, "_d_eh_enter_catch");
-#if 1
     // Exceptions are never rethrown by D code (but thrown again), so
     // we can leave the catch handler right away and continue execution
     // outside the catch funclet
@@ -786,21 +783,9 @@ public:
       llvm::BasicBlock::Create(irs->context(), "catchhandler", irs->topfunc());
     llvm::CatchReturnInst::Create(catchpad, catchhandler, irs->scopebb());
     irs->scope() = IRScope(catchhandler);
+    auto enterCatchFn =
+      getRuntimeFunction(Loc(), irs->module, "_d_eh_enter_catch");
     irs->CreateCallOrInvoke(enterCatchFn, DtoBitCast(exnObj, getVoidPtrType()), clssInfo);
-#else
-    irs->ir->CreateCall(enterCatchFn,
-                        {DtoBitCast(exnObj, getVoidPtrType()), clssInfo},
-                        {llvm::OperandBundleDef("funclet", catchpad)});
-
-    // The code generator will extract the catch handler to funclets
-    // so it needs to know the end of the code executed in the handler.
-    // This is marked by a catch return instruction that is created here
-    // as a cleanup so it appears in all code paths exiting the catch block
-    llvm::BasicBlock *retbb =
-        llvm::BasicBlock::Create(irs->context(), "catchret", irs->topfunc());
-    llvm::CatchReturnInst::Create(catchpad, endbb, retbb);
-    irs->func()->scopes->pushCleanup(retbb, retbb);
-#endif
   }
 #endif
 
@@ -851,10 +836,7 @@ public:
         irs->scope() = IRScope(catchBB);
         irs->DBuilder.EmitBlockStart((*it)->loc);
 
-        CleanupCursor currentScope = scopes->currentCleanupScope();
-
         emitBeginCatchMSVCEH(*it, endbb, catchSwitchInst);
-        //scopes->pushFunclet(&catchBB->front());
 
         // Emit handler, if there is one. The handler is zero, for instance,
         // when building 'catch { debug foo(); }' in non-debug mode.
@@ -863,10 +845,8 @@ public:
         }
 
         if (!irs->scopereturned()) {
-          scopes->runCleanups(currentScope, endbb);
+          irs->ir->CreateBr(endbb);
         }
-        scopes->popCleanups(currentScope);
-        //scopes->popFunclet();
 
         irs->DBuilder.EmitBlockEnd();
 

ir/irfunction.cpp

@@ -184,7 +184,6 @@ void executeCleanup(IRState *irs, CleanupScope &scope,
   scope.exitTargets.push_back(CleanupExitTarget(continueWith));
   scope.exitTargets.back().sourceBlocks.push_back(sourceBlock);
 }
-
 }
 
 ScopeStack::~ScopeStack() {
@@ -255,17 +254,6 @@ llvm::BasicBlock *ScopeStack::runCleanupPad(CleanupCursor scope,
   if (isCatchSwitchBlock(cleanupScopes[scope].beginBlock))
     return cleanupScopes[scope].beginBlock;
 
-  // when hitting a catch return instruction during cleanup,
-  //  just unwind to the corresponding catchswitch block instead
-  if (!cleanupScopes[scope].beginBlock->empty()) {
-    if (auto catchret = llvm::dyn_cast<llvm::CatchReturnInst>(
-      &cleanupScopes[scope].beginBlock->front())) {
-      llvm::BasicBlock* endcatch = nullptr;
-      auto catchpad = catchret->getCatchPad();
-      auto catchswitch = catchpad->getCatchSwitch();
-      return catchswitch->getUnwindDest();
-    }
-  }
 
   // each cleanup block is bracketed by a pair of cleanuppad/cleanupret
   // instructions, any unwinding should also just continue at the next

ir/irfunction.h

@@ -416,7 +416,6 @@ llvm::CallSite ScopeStack::callOrInvoke(llvm::Value *callee, const T &args,
 #endif
 
   if (doesNotThrow || (cleanupScopes.empty() && catchScopes.empty())) {
-L_call:
     llvm::CallInst *call = irs->ir->CreateCall(callee, args,
 #if LDC_LLVM_VER >= 308
                                                BundleList, 
@@ -429,8 +428,6 @@ L_call:
   }
 
   llvm::BasicBlock* landingPad = getLandingPad();
-  if (!landingPad)
-    goto L_call;
 
   llvm::BasicBlock *postinvoke = llvm::BasicBlock::Create(
       irs->context(), "postinvoke", irs->topfunc(), landingPad);