Skip to content

Fix Issue 7016 - local import does not create -deps dependency #6468

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

Closed
RazvanN7 wants to merge 3 commits into from
Closed

Fix Issue 7016 - local import does not create -deps dependency #6468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6025fc
Fix Issue 7016 - local import does not create -deps dependency
RazvanN7 Jan 18, 2017
bdb7f84
Added the feature to avoid infinite recursion + rebased
RazvanN7 Jan 25, 2017
d6b3a44
Replaced AA with root.hashtable
RazvanN7 Jan 25, 2017
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
41 changes: 38 additions & 3 deletions src/mars.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import ddmd.target;
import ddmd.tokens;
import ddmd.utils;

import ddmd.root.stringtable;

/**
* Print DMD's logo on stdout
Expand Down Expand Up @@ -186,7 +187,6 @@ extern (C++) __gshared Module entrypoint = null;
/// Module in which the D main is
extern (C++) __gshared Module rootHasMain = null;


/**
* Generate C main() in response to seeing D main().
*
Expand Down Expand Up @@ -241,6 +241,36 @@ extern (C++) void genCmain(Scope* sc)
rootHasMain = sc._module;
}

/**
* Recursevely call semantic3() on import tree nodes.
*/
private void semantic3OnDependencies(Module m, StringTable *importArray)
{
if (!m)
return;

const(char) *mName = m.toChars();
size_t mNameLen = strlen(mName);

if (importArray.lookup(mName, mNameLen))
return;
else
{
if(global.params.verbose)
fprintf(global.stdmsg, "semantic3 %s\n", mName);

// The value of the hashtable doesn't matter, just the key is important
importArray.insert(mName, mNameLen, cast(void*) mName);
m.semantic3(null);

// start from 1 to avoid calling semantic3 on object
for (int i=1; i<m.aimports.dim; i++)
{
Module mi = m.aimports[i];
semantic3OnDependencies(mi, importArray);
}
}
}

/**
* DMD's real entry point
Expand Down Expand Up @@ -1435,7 +1465,6 @@ Language changes listed by -transition=id:
fatal();

backend_init();

// Do semantic analysis
for (size_t i = 0; i < modules.dim; i++)
{
Expand Down Expand Up @@ -1498,9 +1527,15 @@ Language changes listed by -transition=id:
fatal();

// inlineScan incrementally run semantic3 of each expanded functions.
// So deps file generation should be moved after the inlinig stage.
// So deps file generation should be moved after the inlining stage.
if (global.params.moduleDeps)
{
// Bugzilla 7016
StringTable importArray;
importArray._init();

semantic3OnDependencies(modules[0], &importArray);

OutBuffer* ob = global.params.moduleDeps;
if (global.params.moduleDepsFile)
{
Expand Down
2 changes: 1 addition & 1 deletion test/compilable/extra-files/depsOutput9948a.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ module depsOutput9948a;
void templateFunc(string myImport)()
{
mixin(myImport);
}
}