Skip to content

Merge pull request #5828 from WalterBright/fix16080 #5829

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
MartinNowak merged 1 commit into from
Jun 1, 2016
Merged

Merge pull request #5828 from WalterBright/fix16080 #5829

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions src/backend/cgobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,7 +2502,7 @@ int Obj::external_def(const char *name)
{ unsigned len;
char *e;

//dbg_printf("Obj::external_def('%s')\n",name);
//printf("Obj::external_def('%s', %d)\n",name,obj.extidx + 1);
assert(name);
len = strlen(name); // length of identifier
if (obj.extdatai + len + ONS_OHD + 1 > sizeof(obj.extdata))
Expand All @@ -2526,7 +2526,7 @@ int Obj::external_def(const char *name)

int Obj::external(Symbol *s)
{
//dbg_printf("Obj::external('%s')\n",s->Sident);
//printf("Obj::external('%s', %d)\n",s->Sident, obj.extidx + 1);
symbol_debug(s);
obj.reset_symbuf->write(&s, sizeof(s));
if (obj.extdatai + (IDMAX + IDOHD) + 3 > sizeof(obj.extdata))
Expand Down Expand Up @@ -2593,7 +2593,8 @@ int Obj::common_block(Symbol *s,int flag,targ_size_t size,targ_size_t count)
unsigned long length;
unsigned ti;

//dbg_printf("Obj::common_block('%s',%d,%d,%d)\n",s->Sident,flag,size,count);
//printf("Obj::common_block('%s',%d,%d,%d, %d)\n",s->Sident,flag,size,count, obj.extidx + 1);
obj.reset_symbuf->write(&s, sizeof(s));
outextdata(); // borrow the extdata[] storage
i = Obj::mangle(s,obj.extdata);

Expand Down Expand Up @@ -3401,7 +3402,10 @@ int Obj::reftoident(int seg,targ_size_t offset,Symbol *s,targ_size_t val,
{ external = s->Sxtrnnum;
#ifdef DEBUG
if (external > obj.extidx)
{
printf("obj.extidx = %d\n", obj.extidx);
symbol_print(s);
}
#endif
assert(external <= obj.extidx);
}
Expand Down
6 changes: 6 additions & 0 deletions test/compilable/extra-files/test16080b.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import imp16080;

void test2() {
A!() v = A!().a;
}

4 changes: 4 additions & 0 deletions test/compilable/imports/imp16080.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
struct A() {
static immutable A a;
}

6 changes: 6 additions & 0 deletions test/compilable/test16080.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// REQUIRED_ARGS: -lib -Icompilable/imports
// EXTRA_SOURCES: extra-files/test16080b.d
// https://issues.dlang.org/show_bug.cgi?id=16080

import imp16080;