Changeset 652:c8fcde3337b0

Timestamp:

10/05/08 16:26:25 (2 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Fix TryFinally? without body or finalbody.

Files:

• gen/statements.cpp (modified) (3 diffs)

gen/statements.cpp

@@ -512 +512 @@
-        DtoDwarfStopPoint(loc.linnum);
-
+    // if there's no finalbody or no body, things are simple
+    if (!finalbody) {
+        if (body)
+            body->toIR(p);
+        return;
+    }
+    if (!body) {
+        finalbody->toIR(p);
+        return;
+    }
+
-    // create basic blocks
-    llvm::BasicBlock* oldend = p->scopeend();
@@ -530 +541 @@
-    p->scope() = IRScope(landingpadbb, endbb);
-
+    assert(finalbody);
-    gIR->func()->landingPad.addFinally(finalbody);
-    gIR->func()->landingPad.push(landingpadbb);
@@ -551 +563 @@
-    //
-    p->scope() = IRScope(finallybb,landingpadbb);
-    assert(finalbody);
-    finalbody->toIR(p);
-