Mercurial > projects > ldc
diff dmd/module.c @ 1630:44b145be2ef5
Merge dmd 1.056.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Sat, 06 Feb 2010 15:53:52 +0000 |
parents | def7a1d494fd |
children | 9bf06e02070b |
line wrap: on
line diff
--- a/dmd/module.c Wed Jan 06 19:53:35 2010 +0100 +++ b/dmd/module.c Sat Feb 06 15:53:52 2010 +0000 @@ -1,6 +1,6 @@ // Compiler implementation of the D programming language -// Copyright (c) 1999-2009 by Digital Mars +// Copyright (c) 1999-2010 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com @@ -44,7 +44,7 @@ #include "d-dmd-gcc.h" #endif - +#if IN_LLVM #include "llvm/Support/CommandLine.h" #include <map> @@ -55,8 +55,7 @@ static llvm::cl::opt<bool> fqnNames("oq", llvm::cl::desc("Write object files with fully qualified names"), llvm::cl::ZeroOrMore); - - +#endif ClassDeclaration *Module::moduleinfo; @@ -971,7 +970,8 @@ void Module::runDeferredSemantic() { - size_t len; + if (dprogress == 0) + return; static int nested; if (nested) @@ -979,6 +979,7 @@ //if (deferred.dim) printf("+Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim); nested++; + size_t len; do { dprogress = 0;