mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-01-25 09:03:14 +01:00
First merge of 2.064 beta.
This corresponds to DMD commit a913ce4bc59a94a022a27e390fc841f4aededffb. Doesn't build Phobos yet.
This commit is contained in:
committed by
Kai Nacke
parent
c400d180d2
commit
cb341586e3
@@ -805,7 +805,7 @@ void ThrowStatement::toIR(IRState* p)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// used to build the sorted list of cases
|
||||
struct Case : Object
|
||||
struct Case : RootObject
|
||||
{
|
||||
StringExp* str;
|
||||
size_t index;
|
||||
@@ -815,7 +815,7 @@ struct Case : Object
|
||||
index = i;
|
||||
}
|
||||
|
||||
int compare(Object *obj) {
|
||||
int compare(RootObject *obj) {
|
||||
Case* c2 = static_cast<Case*>(obj);
|
||||
return str->compare(c2->str);
|
||||
}
|
||||
@@ -922,7 +922,7 @@ void SwitchStatement::toIR(IRState* p)
|
||||
{
|
||||
// string switch?
|
||||
llvm::Value* switchTable = 0;
|
||||
Array caseArray;
|
||||
Objects caseArray;
|
||||
if (!condition->type->isintegral())
|
||||
{
|
||||
Logger::println("is string switch");
|
||||
@@ -1388,7 +1388,7 @@ void LabelStatement::toIR(IRState* p)
|
||||
{
|
||||
IRAsmStmt* a = new IRAsmStmt;
|
||||
std::stringstream label;
|
||||
printLabelName(label, p->func()->decl->mangle(), ident->toChars());
|
||||
printLabelName(label, p->func()->decl->mangleExact(), ident->toChars());
|
||||
label << ":";
|
||||
a->code = label.str();
|
||||
p->asmBlock->s.push_back(a);
|
||||
|
||||
Reference in New Issue
Block a user