From 0647cfb50c26baaed972175c83aa6e79daa67dec Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sun, 4 Nov 2012 14:28:26 +0100 Subject: [PATCH] Re-enable inlining by default for -O2 and above. This fixes a bug introduced in 2f78dc686. Thanks to Jernej (jerro) for the fix! --- gen/optimizer.cpp | 2 +- runtime/phobos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gen/optimizer.cpp b/gen/optimizer.cpp index 52a03b30..1aabf4ba 100644 --- a/gen/optimizer.cpp +++ b/gen/optimizer.cpp @@ -101,7 +101,7 @@ static unsigned sizeLevel() { // Determines whether or not to run the normal, full inlining pass. bool willInline() { return enableInlining == cl::BOU_TRUE || - (enableInlining != cl::BOU_UNSET && optLevel() > 1); + (enableInlining == cl::BOU_UNSET && optLevel() > 1); } llvm::CodeGenOpt::Level codeGenOptLevel() { diff --git a/runtime/phobos b/runtime/phobos index 16b031a5..c3574a7b 160000 --- a/runtime/phobos +++ b/runtime/phobos @@ -1 +1 @@ -Subproject commit 16b031a512117e79431612dc37bf8e91ea20f1f6 +Subproject commit c3574a7bc6048a6f0c20cdbf9306b5ee87fd6afc