Enable scalar and PHI code generation for Polly

The feature itself has been committed by Johannes in r238070. As this is the
way forward, we now enable it to ensure we get test coverage.

Thank you Johannes for this nice work!

llvm-svn: 238088

2 files changed, 2 insertions, 2 deletions

diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp
index 88f482b28031..a297bc2a440c 100644
--- a/polly/lib/Analysis/ScopDetection.cpp
+++ b/polly/lib/Analysis/ScopDetection.cpp
@@ -170,7 +170,7 @@ static cl::opt<bool, true> XPollyModelPHINodes(
     "polly-model-phi-nodes",
     cl::desc("Allow PHI nodes in the input [Unsafe with code-generation!]."),
     cl::location(PollyModelPHINodes), cl::Hidden, cl::ZeroOrMore,
-    cl::init(false), cl::cat(PollyCategory));
+    cl::init(true), cl::cat(PollyCategory));
 
 bool polly::PollyModelPHINodes = false;
 bool polly::PollyTrackFailures = false;
diff --git a/polly/lib/Transform/IndependentBlocks.cpp b/polly/lib/Transform/IndependentBlocks.cpp
index 8a0c0f45bae2..c7b449af13db 100644
--- a/polly/lib/Transform/IndependentBlocks.cpp
+++ b/polly/lib/Transform/IndependentBlocks.cpp
@@ -35,7 +35,7 @@ using namespace llvm;
 static cl::opt<bool> DisableIntraScopScalarToArray(
     "disable-polly-intra-scop-scalar-to-array",
     cl::desc("Do not rewrite scalar to array to generate independent blocks"),
-    cl::Hidden, cl::init(false), cl::cat(PollyCategory));
+    cl::Hidden, cl::init(true), cl::cat(PollyCategory));
 
 namespace {
 struct IndependentBlocks : public FunctionPass {