Changeset 1145:40caa8207b3e

Timestamp:

03/26/09 13:46:21 (3 years ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen gmail.com>

branch:

default

Message:

Moved IRTargetScopeS from IRState into IrFunction?, fixes #240 .

Files:

• gen/irstate.h (modified) (3 diffs)
• gen/llvmhelpers.cpp (modified) (2 diffs)
• gen/statements.cpp (modified) (19 diffs)
• ir/irfunction.h (modified) (2 diffs)

gen/irstate.h

@@ -37 +37 @@
-struct BaseClass;
-struct AnonDeclaration;
-struct EnclosingHandler;
-
-struct IrModule;
@@ -50 +49 @@
-    IRScope();
-    IRScope(llvm::BasicBlock* b, llvm::BasicBlock* e);
-};
-
-// scope statements that can be target of jumps
-// includes loops, switch, case, labels
-struct IRTargetScope
-{
-    // generating statement
-    Statement* s;
-    
-    // the try of a TryFinally that encloses the loop
-    EnclosingHandler* enclosinghandler;
-    
-    llvm::BasicBlock* breakTarget;
-    llvm::BasicBlock* continueTarget;
-
-    IRTargetScope();
-    IRTargetScope(Statement* s, EnclosingHandler* enclosinghandler, llvm::BasicBlock* continueTarget, llvm::BasicBlock* breakTarget);
-};
-
@@ -160 +142 @@
-    llvm::CallSite CreateCallOrInvoke4(LLValue* Callee, LLValue* Arg1, LLValue* Arg2,  LLValue* Arg3, LLValue* Arg4, const char* Name="");
-
-    // loop blocks
-    typedef std::vector<IRTargetScope> TargetScopeVec;
-    TargetScopeVec targetScopes;
-
-    // this holds the array being indexed or sliced so $ will work
-    // might be a better way but it works. problem is I only get a

gen/llvmhelpers.cpp

@@ -249 +249 @@
-
-    // figure out up until what handler we need to emit
-
-
+
+
+
-        if (targetit->s == target) {
-            break;
-        }
-
-
-
+
+
+
+
-        if (lblstmt)
-            error(loc, "cannot goto into try, volatile or synchronized statement at %s", target->loc.toChars());
@@ -271 +273 @@
-    // and might already exist push a label scope
-    gIR->func()->pushUniqueLabelScope("enclosing");
-RState::TargetScopeVec::reverse_iterator it
-for (it = gIR->targetScopes.rbegin(); it != targetit; ++
+rFunction::TargetScopeVec::reverse_iterator it = gIR->func()->targetScopes.rbegin()
+while (it != target
-        if (it->enclosinghandler)
-            it->enclosinghandler->emitCode(gIR);
+        ++it;
-    }
-    gIR->func()->popLabelScope();

gen/statements.cpp

@@ -297 +297 @@
-
-    // while body code
-
+func()->
-    body->toIR(p);
-
+func()->
-
-    // loop
@@ -333 +333 @@
-
-    // do-while body code
-
+func()->
-    body->toIR(p);
-
+func()->
-
-    // branch to condition block
@@ -378 +378 @@
-    llvm::BranchInst::Create(forbb, gIR->scopebb());
-
-
+func()->
-
-    // replace current scope
@@ -421 +421 @@
-        llvm::BranchInst::Create(forbb, gIR->scopebb());
-
-
+func()->
-
-    // rewrite the scope
@@ -455 +455 @@
-        // find the right break block and jump there
-        bool found = false;
-
-
+
+
+
-            if(it->s == targetLoopStatement) {
-                llvm::BranchInst::Create(it->breakTarget, p->scopebb());
@@ -462 +463 @@
-                break;
-            }
+            ++it;
-        }
-        assert(found);
@@ -467 +469 @@
-    else {
-        // find closest scope with a break target
-
-
+
+
+
-            if(it->breakTarget) {
-                break;
-            }
+            ++it;
-        }
-        DtoEnclosingHandlers(loc, it->s);
@@ -506 +510 @@
-        // find the right continue block and jump there
-        bool found = false;
-
-
+
+
+
-            if(it->s == targetLoopStatement) {
-                llvm::BranchInst::Create(it->continueTarget, gIR->scopebb());
@@ -513 +518 @@
-                break;
-            }
+            ++it;
-        }
-        assert(found);
@@ -518 +524 @@
-    else {
-        // find closest scope with a continue target
-
-
+
+
+
-            if(it->continueTarget) {
-                break;
-            }
+            ++it;
-        }
-        DtoEnclosingHandlers(loc, it->s);
@@ -594 +602 @@
-
-    assert(body);
-
+func()->
-    body->toIR(p);
-
+func()->
-
-    // terminate try BB
@@ -852 +860 @@
-
-    p->scope() = IRScope(bodybb, endbb);
-
+func()->
-    body->toIR(p);
-
+func()->
-
-    if (!p->scopereturned())
@@ -973 +981 @@
-        // push loop scope
-        // continue goes to next statement, break goes to end
-
+func()->
-
-        // do statement
@@ -979 +987 @@
-
-        // pop loop scope
-
+func()->
-
-        // next stmt
@@ -1096 +1104 @@
-
-    // emit body
-
+func()->
-    if(body)
-        body->toIR(p);
-
+func()->
-
-    if (!p->scopereturned())
@@ -1192 +1200 @@
-
-    // emit body
-
+func()->
-    if (body)
-        body->toIR(p);
-
+func()->
-
-    // jump to next iteration
@@ -1262 +1270 @@
-
-    if (statement) {
-
+func()->
-        statement->toIR(p);
-
+func()->
-    }
-}
@@ -1386 +1394 @@
-
-    // emit body
-
+func()->
-    body->toIR(p);
-
+func()->
-
-    // exit lock
@@ -1420 +1428 @@
-
-        // do statement
-
+func()->
-        statement->toIR(p);
-
+func()->
-
-        // no point in a unreachable barrier, terminating statements must insert this themselves.

ir/irfunction.h

@@ -9 +9 @@
-#include <stack>
-#include <map>
+
+struct Statement;
+struct EnclosingHandler;
+
+// scope statements that can be target of jumps
+// includes loops, switch, case, labels
+struct IRTargetScope
+{
+    // generating statement
+    Statement* s;
+    
+    // the try of a TryFinally that encloses the loop
+    EnclosingHandler* enclosinghandler;
+    
+    llvm::BasicBlock* breakTarget;
+    llvm::BasicBlock* continueTarget;
+
+    IRTargetScope();
+    IRTargetScope(Statement* s, EnclosingHandler* enclosinghandler, llvm::BasicBlock* continueTarget, llvm::BasicBlock* breakTarget);
+};
-
-// represents a function
@@ -49 +69 @@
-    IRLandingPad landingPad;
-
+    // loop blocks
+    typedef std::vector<IRTargetScope> TargetScopeVec;
+    TargetScopeVec targetScopes;
+
+    // constructor
-    IrFunction(FuncDeclaration* fd);
-