Mercurial > projects > ldc

diff gen/toir.cpp @ 314:8d98e42ece93 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r335] The basics of exception handling are in place. Still need to make sure calls are turned into invokes everywhere. (NewExpression for instance) Still some rough edges and corner cases to figure out. Needs testing!
author ChristianK
date Wed, 02 Jul 2008 22:20:18 +0200
parents a498b736a0bd
children a9697749e898
line wrap: on
line diff
--- a/gen/toir.cpp	Sun Jun 29 22:22:37 2008 +0200
+++ b/gen/toir.cpp	Wed Jul 02 22:20:18 2008 +0200
@@ -1246,38 +1246,82 @@
     //Logger::cout() << "Calling: " << *funcval << '\n';
 
     // call the function
-    llvm::CallInst* call = llvm::CallInst::Create(funcval, llargs.begin(), llargs.end(), varname, p->scopebb());
-    LLValue* retllval = (retinptr) ? llargs[0] : call;
-
-    if (retinptr && dfn && dfn->func && dfn->func->runTimeHack) {
-        const LLType* rettype = getPtrToType(DtoType(type));
-        if (retllval->getType() != rettype) {
-            Logger::println("llvmRunTimeHack==true - force casting return value");
-            Logger::cout() << "from: " << *retllval->getType() << " to: " << *rettype << '\n';
-            retllval = DtoBitCast(retllval, rettype);
+    LLValue* retllval;
+    if(p->landingPads.empty())
+    {
+        llvm::CallInst* call = llvm::CallInst::Create(funcval, llargs.begin(), llargs.end(), varname, p->scopebb());
+
+        retllval = (retinptr) ? llargs[0] : call;
+
+        if (retinptr && dfn && dfn->func && dfn->func->runTimeHack) {
+            const LLType* rettype = getPtrToType(DtoType(type));
+            if (retllval->getType() != rettype) {
+                Logger::println("llvmRunTimeHack==true - force casting return value");
+                Logger::cout() << "from: " << *retllval->getType() << " to: " << *rettype << '\n';
+                retllval = DtoBitCast(retllval, rettype);
+            }
         }
-    }
-
-    // set calling convention
-    if (dfn && dfn->func) {
-        int li = dfn->func->llvmInternal;
-        if (li != LLVMintrinsic && li != LLVMva_start && li != LLVMva_intrinsic) {
+
+        // set calling convention
+        if (dfn && dfn->func) {
+            int li = dfn->func->llvmInternal;
+            if (li != LLVMintrinsic && li != LLVMva_start && li != LLVMva_intrinsic) {
+                call->setCallingConv(DtoCallingConv(dlink));
+            }
+        }
+        /*else if (delegateCall) {
+            call->setCallingConv(DtoCallingConv(dlink));
+        }*/
+        else if (dfn && dfn->cc != (unsigned)-1) {
+            call->setCallingConv(dfn->cc);
+        }
+        else {
             call->setCallingConv(DtoCallingConv(dlink));
         }
-    }
-    /*else if (delegateCall) {
-        call->setCallingConv(DtoCallingConv(dlink));
-    }*/
-    else if (dfn && dfn->cc != (unsigned)-1) {
-        call->setCallingConv(dfn->cc);
+
+        // param attrs
+        call->setParamAttrs(palist);
     }
-    else {
-        call->setCallingConv(DtoCallingConv(dlink));
+    else
+    {
+        llvm::BasicBlock* postinvoke = llvm::BasicBlock::Create("postinvoke", p->topfunc(), p->scopeend());
+        llvm::InvokeInst* call = llvm::InvokeInst::Create(funcval, postinvoke, *p->landingPads.rbegin(), llargs.begin(), llargs.end(), varname, p->scopebb());
+        p->scope() = IRScope(postinvoke, p->scopeend());
+
+
+        //FIXME: Code duplication!
+        retllval = (retinptr) ? llargs[0] : call;
+
+        if (retinptr && dfn && dfn->func && dfn->func->runTimeHack) {
+            const LLType* rettype = getPtrToType(DtoType(type));
+            if (retllval->getType() != rettype) {
+                Logger::println("llvmRunTimeHack==true - force casting return value");
+                Logger::cout() << "from: " << *retllval->getType() << " to: " << *rettype << '\n';
+                retllval = DtoBitCast(retllval, rettype);
+            }
+        }
+
+        // set calling convention
+        if (dfn && dfn->func) {
+            int li = dfn->func->llvmInternal;
+            if (li != LLVMintrinsic && li != LLVMva_start && li != LLVMva_intrinsic) {
+                call->setCallingConv(DtoCallingConv(dlink));
+            }
+        }
+        /*else if (delegateCall) {
+            call->setCallingConv(DtoCallingConv(dlink));
+        }*/
+        else if (dfn && dfn->cc != (unsigned)-1) {
+            call->setCallingConv(dfn->cc);
+        }
+        else {
+            call->setCallingConv(DtoCallingConv(dlink));
+        }
+
+        // param attrs
+        call->setParamAttrs(palist);
     }
 
-    // param attrs
-    call->setParamAttrs(palist);
-
     return new DImValue(type, retllval, isInPlace);
 }