Mercurial > projects > ldc

diff ir/irfunction.cpp @ 355:d8357f7004ca trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r376] Fix bug with finally blocks and labels. The labels would get emitted multiple times and conflict. It is now possible to add label scopes in IrFunction and all labels names will be prefixed accordingly. Also disallow goto into finally blocks. Fixes nocompile/finally_02 and others.
author ChristianK
date Mon, 14 Jul 2008 11:48:55 +0200
parents d59c363fccad
children a34078905d01
line wrap: on
line diff
--- a/ir/irfunction.cpp	Mon Jul 14 11:47:03 2008 +0200
+++ b/ir/irfunction.cpp	Mon Jul 14 11:48:55 2008 +0200
@@ -3,6 +3,8 @@
 #include "gen/tollvm.h"
 #include "ir/irfunction.h"
 
+#include <sstream>
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -29,4 +31,31 @@
 
     srcfileArg = NULL;
     msgArg = NULL;
+
+    nextUnique.push(0);
 }
+
+std::string IrFunction::getScopedLabelName(const char* ident)
+{
+    if(labelScopes.empty())
+        return std::string(ident);
+
+    std::string result = "__";
+    for(unsigned int i = 0; i < labelScopes.size(); ++i)
+        result += labelScopes[i] + "_";
+    return result + ident;
+}
+
+void IrFunction::pushUniqueLabelScope(const char* name)
+{
+    std::ostringstream uniquename;
+    uniquename << name << nextUnique.top()++;
+    nextUnique.push(0);
+    labelScopes.push_back(uniquename.str());
+}
+
+void IrFunction::popLabelScope()
+{
+    labelScopes.pop_back();
+    nextUnique.pop();
+}