@@ -80,7 +80,7 @@ unsigned ARMBaseRegisterInfo::getRegisterNumbering(unsigned RegEnum,

   case D23: return 23;

   case D24: return 24;

   case D25: return 25;

-  case D26: return 27;

+  case D26: return 26;

   case D27: return 27;

   case D28: return 28;

   case D29: return 29;

@@ -2307,6 +2307,7 @@ X86TargetLowering::IsEligibleForTailCallOptimization(SDValue Callee,

     return false;

   // If -tailcallopt is specified, make fastcc functions tail-callable.

+  const MachineFunction &MF = DAG.getMachineFunction();

   const Function *CallerF = DAG.getMachineFunction().getFunction();

   if (GuaranteedTailCallOpt) {

     if (IsTailCallConvention(CalleeCC) &&

@@ -2318,6 +2319,11 @@ X86TargetLowering::IsEligibleForTailCallOptimization(SDValue Callee,

   // Look for obvious safe cases to perform tail call optimization that does not

   // requite ABI changes. This is what gcc calls sibcall.

+  // Can't do sibcall if stack needs to be dynamically re-aligned. PEI needs to

+  // emit a special epilogue.

+  if (RegInfo->needsStackRealignment(MF))

+    return false;

+

   // Do not sibcall optimize vararg calls for now.

   if (isVarArg)

     return false;

@@ -216,3 +216,16 @@ entry:

 }

 declare fastcc %struct.ns* @foo7(%struct.cp* byval align 4, i8 signext) nounwind ssp

+

+

+

+define void @t19() alignstack(32) nounwind {

+entry:

+; CHECK: t19:

+; CHECK: andl $-32

+; CHECK: call {{_?}}foo

+  tail call void @foo() nounwind

+  ret void

+}

+

+declare void @foo()

@@ -374,6 +374,7 @@ TEST(APFloatTest, makeNaN) {

 }

 #ifdef GTEST_HAS_DEATH_TEST

+#ifndef NDEBUG

 TEST(APFloatTest, SemanticsDeath) {

   EXPECT_DEATH(APFloat(APFloat::IEEEsingle, 0.0f).convertToDouble(), "Float semantics are not IEEEdouble");

   EXPECT_DEATH(APFloat(APFloat::IEEEdouble, 0.0 ).convertToFloat(),  "Float semantics are not IEEEsingle");

@@ -573,5 +574,6 @@ TEST(APFloatTest, StringHexadecimalExponentDeath) {

   EXPECT_DEATH(APFloat(APFloat::IEEEdouble, "-0x1.1p-"), "Exponent has no digits");

 }

 #endif

+#endif

 }

@@ -328,6 +328,7 @@ TEST(APIntTest, Log2) {

 }

 #ifdef GTEST_HAS_DEATH_TEST

+#ifndef NDEBUG

 TEST(APIntTest, StringDeath) {

   EXPECT_DEATH(APInt(0, "", 0), "Bitwidth too small");

   EXPECT_DEATH(APInt(32, "", 0), "Invalid string length");

@@ -340,5 +341,6 @@ TEST(APIntTest, StringDeath) {

   EXPECT_DEATH(APInt(32, "1L", 10), "Invalid character in digit string");

 }

 #endif

+#endif

 }

@@ -14,18 +14,20 @@

 # Set up variables for building a unit test.

 ifdef TESTNAME

-CPP.Flags += -DGTEST_HAS_RTTI=0

-# gcc's TR1 <tuple> header depends on RTTI, so force googletest to use

-# its own tuple implementation.  When we import googletest >=1.4.0, we

-# can drop this line.

-CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0

-

 include $(LEVEL)/Makefile.common

 LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)

-CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/

-CPP.Flags += $(NO_VARIADIC_MACROS)

+# Note that these flags are duplicated when building GoogleTest itself in

+# utils/unittest/googletest/Makefile; ensure that any changes are made to both.

+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include

+CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)

+CPP.Flags += -DGTEST_HAS_RTTI=0

+# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not

+# supported by Clang, so force googletest to use its own tuple implementation.

+# When we import googletest >=1.4.0, we can drop this line.

+CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0

+

 TESTLIBS = -lGoogleTest -lUnitTestMain

 ifeq ($(ENABLE_SHARED), 1)

@@ -15,6 +15,7 @@ using namespace llvm;

 namespace {

 #ifdef GTEST_HAS_DEATH_TEST

+#ifndef NDEBUG

 TEST(LeakDetector, Death1) {

   LeakDetector::addGarbageObject((void*) 1);

   LeakDetector::addGarbageObject((void*) 2);

@@ -25,5 +26,6 @@ TEST(LeakDetector, Death1) {

                "Cache != o && \"Object already in set!\"");

 }

 #endif

+#endif

 }

@@ -14,7 +14,13 @@ include $(LEVEL)/Makefile.config

 LIBRARYNAME = UnitTestMain

 BUILD_ARCHIVE = 1

 REQUIRES_RTTI = 1

+

 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include

 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)

+CPP.Flags += -DGTEST_HAS_RTTI=0

+# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not

+# supported by Clang, so force googletest to use its own tuple implementation.

+# When we import googletest >=1.4.0, we can drop this line.

+CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0

 include $(LEVEL)/Makefile.common

@@ -14,8 +14,18 @@ include $(LEVEL)/Makefile.config

 LIBRARYNAME = GoogleTest

 BUILD_ARCHIVE = 1

 REQUIRES_RTTI = 1

+

+# Note that these flags are duplicated when building individual tests in

+# unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any

+# changes are made to both.

 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include

 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)

+CPP.Flags += -DGTEST_HAS_RTTI=0

+# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not

+# supported by Clang, so force googletest to use its own tuple implementation.

+# When we import googletest >=1.4.0, we can drop this line.

+CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0

+

 ifeq ($(HOST_OS),MingW)

   CPP.Flags += -DGTEST_OS_WINDOWS=1