Mercurial > projects > ldc
annotate runtime/internal/invariant.d @ 1605:1d5721f9ae18
[WIP] Merge DMD r251: bugzilla 111 (appending a dchar to a char[])
This patch needs some work in the code generation, because of the runtime
changes (functions "_d_arrayappendcd" and "_d_arrayappendwd" are added).
This doesn't affect existing code though, it just makes with patch
a little useless, because something like this:
char [] s;
s ~= '\u6211';
That failed to compile with a nice error message previously to this
change, now fails with and ugly error message (a failed assertion).
Apparently there is a regression introduced by this patch too, when
compiling Dil I get this assertion message:
ldc: /home/luca/tesis/ldc/gen/statements.cpp:132: virtual void ReturnStatement::toIR(IRState*): Assertion `p->topfunc()->getReturnType() == llvm::Type::getVoidTy(gIR->context())' failed.
0 ldc 0x08a91628
Thank god we have bisecting capabilities in VCSs now ;)
---
dmd/expression.c | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:19 -0300 |
parents | d7ec997de427 |
children |
rev | line source |
---|---|
530
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
1 |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
2 /* |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
3 * Placed into the Public Domain |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
4 * written by Walter Bright |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
5 * www.digitalmars.com |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
6 */ |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
7 |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
8 extern(C) void _d_invariant(Object o) |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
9 { ClassInfo c; |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
10 |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
11 //printf("__d_invariant(%p)\n", o); |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
12 |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
13 // BUG: needs to be filename/line of caller, not library routine |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
14 assert(o !is null); // just do null check, not invariant check |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
15 |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
16 c = o.classinfo; |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
17 do |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
18 { |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
19 if (c.classInvariant) |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
20 { |
1440
d7ec997de427
Adjust runtime for recent ABI change on x86-64, since member functions are no
Frits van Bommel <fvbommel wxs.nl>
parents:
530
diff
changeset
|
21 void delegate() inv; |
d7ec997de427
Adjust runtime for recent ABI change on x86-64, since member functions are no
Frits van Bommel <fvbommel wxs.nl>
parents:
530
diff
changeset
|
22 inv.ptr = cast(void*) o; |
d7ec997de427
Adjust runtime for recent ABI change on x86-64, since member functions are no
Frits van Bommel <fvbommel wxs.nl>
parents:
530
diff
changeset
|
23 inv.funcptr = c.classInvariant; |
d7ec997de427
Adjust runtime for recent ABI change on x86-64, since member functions are no
Frits van Bommel <fvbommel wxs.nl>
parents:
530
diff
changeset
|
24 inv(); |
530
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
25 } |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
26 c = c.base; |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
27 } while (c); |
d30c40f1128d
Make class invariants work.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
28 } |