D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[svn r376] Fix bug with finally blocks and labels. The labels would get emitted multiple times and conflict.

Browse Source 
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.
This commit is contained in:
Christian Kamm
2008-07-14 11:48:55 +02:00
parent 65be990012
commit c1fbcd9942
5 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ir/irfunction.cpp
View File

@@ -3,6 +3,8 @@
#include "gen/tollvm.h"
#include "ir/irfunction.h"
#include <sstream>
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -29,4 +31,31 @@ IrFunction::IrFunction(FuncDeclaration* fd)
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();
}