From 3ea71a58aa7727a21d43e3932a8f9212bcfea9ad Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Tue, 3 Nov 2009 19:35:13 +0000
Subject: [PATCH] turn IPSCCP back on by default, try #3 or 4? Woo.

llvm-svn: 85929
---
 include/llvm/Support/StandardPasses.h | 3 +--
 test/FrontendC++/integration-O2.cpp   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/llvm/Support/StandardPasses.h b/include/llvm/Support/StandardPasses.h
index a5394445a19..1a6d06b9fad 100644
--- a/include/llvm/Support/StandardPasses.h
+++ b/include/llvm/Support/StandardPasses.h
@@ -99,8 +99,7 @@ namespace llvm {
     if (UnitAtATime) {
       PM->add(createGlobalOptimizerPass());     // Optimize out global vars
       
-      PM->add(createIPConstantPropagationPass());              // IP CP
-//      PM->add(createIPSCCPPass());              // IP SCCP
+      PM->add(createIPSCCPPass());              // IP SCCP
       PM->add(createDeadArgEliminationPass());  // Dead argument elimination
     }
     PM->add(createInstructionCombiningPass());  // Clean up after IPCP & DAE
diff --git a/test/FrontendC++/integration-O2.cpp b/test/FrontendC++/integration-O2.cpp
index 5f3f01a27f9..bb65ac21033 100644
--- a/test/FrontendC++/integration-O2.cpp
+++ b/test/FrontendC++/integration-O2.cpp
@@ -1,5 +1,4 @@
 // RUN: %llvmgxx %s -O2 -S -o - | FileCheck %s
-// XFAIL: *
 
 // This test verifies that we get expected codegen out of the -O2 optimization
 // level from the full optimizer.