diff gen/toir.cpp @ 1142:49421d3ac5a7

Automated merge with http://hg.dsource.org/projects/ldc
author Christian Kamm <kamm incasoftware de>
date Tue, 24 Mar 2009 21:18:29 +0100
parents f99a3b393c03
children 1860414bf3b7
line wrap: on
line diff
--- a/gen/toir.cpp	Tue Mar 24 18:22:47 2009 +0100
+++ b/gen/toir.cpp	Tue Mar 24 21:18:29 2009 +0100
@@ -1783,7 +1783,7 @@
 
         // call assert runtime functions
         p->scope() = IRScope(assertbb,endbb);
-        DtoAssert(p->func()->decl->getModule(), &loc, msg ? msg->toElem(p) : NULL);
+        DtoAssert(p->func()->decl->getModule(), loc, msg ? msg->toElem(p) : NULL);
 
         // rewrite the scope
         p->scope() = IRScope(endbb,oldend);
@@ -1958,7 +1958,7 @@
     // FIXME: DMD inserts a trap here... we probably should as well !?!
 
 #if 1
-    DtoAssert(p->func()->decl->getModule(), &loc, NULL);
+    DtoAssert(p->func()->decl->getModule(), loc, NULL);
 #else
     // call the new (?) trap intrinsic
     p->ir->CreateCall(GET_INTRINSIC_DECL(trap),"");