diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index cd3d48ded8ea3f92881a1407074367941b31ed8d..155286dd765541563dc02efcf13ff3541b330de1 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -ba99ee345694da61eca7b555517d540ff3dc0a56 +62ce36f3737de691217c21f0173f411734eb1d43 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/dinterpret.c b/gcc/d/dmd/dinterpret.c index 61f5cdb0730ab0bf6b60d41afea82a75558f41de..e2d49b9e8f147a14cab6e911a08d243c2da0ad4d 100644 --- a/gcc/d/dmd/dinterpret.c +++ b/gcc/d/dmd/dinterpret.c @@ -1652,21 +1652,28 @@ public: { // Little sanity check to make sure it's really a Throwable ClassReferenceExp *boss = oldest->thrown; - assert((*boss->value->elements)[4]->type->ty == Tclass); // Throwable.next + const int next = 4; // index of Throwable.next + assert((*boss->value->elements)[next]->type->ty == Tclass); // Throwable.next ClassReferenceExp *collateral = newest->thrown; if ( isAnErrorException(collateral->originalClass()) && !isAnErrorException(boss->originalClass())) { + /* Find the index of the Error.bypassException field + */ + int bypass = next + 1; + if ((*collateral->value->elements)[bypass]->type->ty == Tuns32) + bypass += 1; // skip over _refcount field + assert((*collateral->value->elements)[bypass]->type->ty == Tclass); + // The new exception bypass the existing chain - assert((*collateral->value->elements)[5]->type->ty == Tclass); - (*collateral->value->elements)[5] = boss; + (*collateral->value->elements)[bypass] = boss; return newest; } - while ((*boss->value->elements)[4]->op == TOKclassreference) + while ((*boss->value->elements)[next]->op == TOKclassreference) { - boss = (ClassReferenceExp *)(*boss->value->elements)[4]; + boss = (ClassReferenceExp *)(*boss->value->elements)[next]; } - (*boss->value->elements)[4] = collateral; + (*boss->value->elements)[next] = collateral; return oldest; }