Skip to content

[dmd-cxx] adjust hardcoded index of Error.bypassException #11052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibuclaw merged 1 commit into from
Apr 21, 2020
Merged

[dmd-cxx] adjust hardcoded index of Error.bypassException #11052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/dinterpret.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,21 +1652,28 @@ class Interpreter : public Visitor
{
// 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;
}

Expand Down