changeset 151:d11848349f97 trunk

[svn r157] Fixed the nasty type==NULL bug :D
author lindquist
date Mon, 24 Mar 2008 20:48:40 +0100
parents 2c336566ffed
children e984333d6ac6
files dmd/mars.c gen/toir.cpp tangotests/stdout1.d
diffstat 3 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dmd/mars.c	Mon Mar 24 20:05:44 2008 +0100
+++ b/dmd/mars.c	Mon Mar 24 20:48:40 2008 +0100
@@ -990,6 +990,7 @@
     if (global.errors)
 	fatal();
 
+#if !IN_LLVM
     // Scan for functions to inline
     if (global.params.useInline)
     {
@@ -1000,6 +1001,7 @@
 	 */
 	if (!global.params.useArrayBounds && !global.params.useAssert)
 	{
+#endif
 	    // Do pass 3 semantic analysis on all imported modules,
 	    // since otherwise functions in them cannot be inlined
 	    for (i = 0; i < Module::amodules.dim; i++)
@@ -1011,6 +1013,7 @@
 	    }
 	    if (global.errors)
 		fatal();
+#if !IN_LLVM
 	}
 
 	for (i = 0; i < modules.dim; i++)
@@ -1023,6 +1026,7 @@
     }
     if (global.errors)
 	fatal();
+#endif
 
     // Generate output files
     for (i = 0; i < modules.dim; i++)
--- a/gen/toir.cpp	Mon Mar 24 20:05:44 2008 +0100
+++ b/gen/toir.cpp	Mon Mar 24 20:48:40 2008 +0100
@@ -1199,7 +1199,6 @@
 
 DValue* CastExp::toElem(IRState* p)
 {
-    assert(type);
     Logger::print("CastExp::toElem: %s | %s\n", toChars(), type->toChars());
     LOG_SCOPE;
 
--- a/tangotests/stdout1.d	Mon Mar 24 20:05:44 2008 +0100
+++ b/tangotests/stdout1.d	Mon Mar 24 20:48:40 2008 +0100
@@ -3,4 +3,5 @@
 void main()
 {
     Stdout("Hello World").newline;
+    Stdout.formatln("{} {}", "Hello", "World");
 }