r244412 - [modules] Don't leak -M flags for dependency file generation into the module

[Richard Smith via cfe-commits]

On Sat, Aug 8, 2015 at 10:42 PM, Justin Bogner via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Richard Smith via cfe-commits <cfe-commits at lists.llvm.org> writes:
> > Author: rsmith
> > Date: Sat Aug  8 21:44:20 2015
> > New Revision: 244412
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=244412&view=rev
> > Log:
> > [modules] Don't leak -M flags for dependency file generation into the
> module
> > build process when we implicitly build a module. Previously, we'd create
> the
> > specified .d file once for each implicitly-built module and then finally
> > overwrite it with the correct contents after the requested build
> completes.
> > (This fails if you use stdout as a dependency file, which is what the
> provided
> > testcase does, and is how I discovered this brokenness.)
>
> I've reverted this in 244414, since the test has been failing on quite a
> few bots for quite a while:
>

Thanks, re-committed with fix in r244415.


>
> http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/29919/steps/check-all
>
> http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/29627/steps/check-all
> http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_check/9959/
> http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto_check/5591/
>
> >
> > Modified:
> >     cfe/trunk/lib/Frontend/CompilerInstance.cpp
> >     cfe/trunk/test/Modules/dependency-gen.modulemap
> >
> > Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=244412&r1=244411&r2=244412&view=diff
> >
> ==============================================================================
> > --- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original)
> > +++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Sat Aug  8 21:44:20 2015
> > @@ -944,8 +944,10 @@ static bool compileModuleImpl(CompilerIn
> >      FullSourceLoc(ImportLoc, ImportingInstance.getSourceManager()));
> >
> >    // If we're collecting module dependencies, we need to share a
> collector
> > -  // between all of the module CompilerInstances.
> > +  // between all of the module CompilerInstances. Other than that, we
> don't
> > +  // want to produce any dependency output from the module build.
> >
> Instance.setModuleDepCollector(ImportingInstance.getModuleDepCollector());
> > +  Invocation->getDependencyOutputOpts() = DependencyOutputOptions();
> >
> >    // Get or create the module map that we'll use to build this module.
> >    std::string InferredModuleMapContent;
> >
> > Modified: cfe/trunk/test/Modules/dependency-gen.modulemap
> > URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/dependency-gen.modulemap?rev=244412&r1=244411&r2=244412&view=diff
> >
> ==============================================================================
> > --- cfe/trunk/test/Modules/dependency-gen.modulemap (original)
> > +++ cfe/trunk/test/Modules/dependency-gen.modulemap Sat Aug  8 21:44:20
> 2015
> > @@ -1,7 +1,10 @@
> >  // RUN: cd %S
> > -// RUN: rm -f %t.cpm %t-base.pcm %t-base.d %t.d
> > -// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test-base -fmodules
> -emit-module -fno-validate-pch -fmodules-strict-decluse
> Inputs/dependency-gen-base.modulemap -dependency-file %t-base.d -MT
> %t-base.pcm -o %t-base.pcm -fmodule-map-file-home-is-cwd
> > -// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test -fmodules -emit-module
> -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t-base.pcm %s
> -dependency-file %t.d -MT %t.pcm -o %t.pcm -fmodules-cache-path=%t
> -fmodule-map-file-home-is-cwd
> > +// RUN: rm -rf %t
> > +//
> > +// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test -fmodules -emit-module
> -fno-validate-pch -fmodules-strict-decluse %s -dependency-file - -MT
> implicit.pcm -o %t/implicit.pcm -fmodules-cache-path=%t
> -fmodule-map-file-home-is-cwd | FileCheck %s
> > +//
> > +// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test-base -fmodules
> -emit-module -fno-validate-pch -fmodules-strict-decluse
> Inputs/dependency-gen-base.modulemap -o %t/base.pcm
> -fmodule-map-file-home-is-cwd
> > +// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test -fmodules -emit-module
> -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t/base.pcm %s
> -dependency-file - -MT explicit.pcm -o %t/explicit.pcm
> -fmodules-cache-path=%t -fmodule-map-file-home-is-cwd | FileCheck %s
> >  // RUN: FileCheck %s < %t.d
>

^^ I forgot to delete this line :)


> >  module "test" {
> >    export *
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150808/f7f12239/attachment.html>