Revert "Address @gribozavr comments to 273b1495834bcc650642aec523dd0504f8623cfa"

This reverts commit 062d14b422.

Revert "Fix a swift argument initialization bug - swift argument should be initialized"

This reverts commit 273b149583.

This breaks DebugAssert as well as REPL builds. Revert to appease the bots while i
look further.
This commit is contained in:
Xin Tong
2016-01-29 07:57:32 -08:00
parent d887d823ef
commit d3c6d1f6d7
19 changed files with 142 additions and 165 deletions

View File

@@ -21,17 +21,25 @@ class CallStaticInline {
func ReturnZero() -> Int64 { return Int64(zero()) }
}
// CHECK-LABEL: define internal i32 @zero()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define hidden i64 @_TFC12clang_inline17CallStaticInline210ReturnZerofT_Vs5Int64(%C12clang_inline17CallStaticInline2*) {{.*}} {
class CallStaticInline2 {
func ReturnZero() -> Int64 { return Int64(wrappedZero()) }
}
// CHECK-LABEL: define internal i32 @wrappedZero()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define hidden i32 @_TF12clang_inline10testExternFT_Vs5Int32() {{.*}} {
func testExtern() -> CInt {
return wrappedGetInt()
}
// CHECK-LABEL: define internal i32 @wrappedGetInt()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define hidden i32 @_TF12clang_inline16testAlwaysInlineFT_Vs5Int32()
// CHECK: [[SSP:#[0-9]+]] {
// NEGATIVE-NOT: @alwaysInlineNumber
@@ -45,29 +53,20 @@ func testInlineRedeclared() -> CInt {
return zeroRedeclared()
}
// CHECK-LABEL: define internal i32 @zeroRedeclared() #{{[0-9]+}} {
// CHECK-LABEL: define hidden i32 @_TF12clang_inline27testInlineRedeclaredWrappedFT_Vs5Int32() {{.*}} {
func testInlineRedeclaredWrapped() -> CInt {
return wrappedZeroRedeclared()
}
// CHECK-LABEL: define internal i32 @wrappedZeroRedeclared() #{{[0-9]+}} {
// CHECK-LABEL: define hidden i32 @_TF12clang_inline22testStaticButNotInlineFT_Vs5Int32() {{.*}} {
func testStaticButNotInline() -> CInt {
return staticButNotInline()
}
// CHECK-LABEL: define internal i32 @zero()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define internal i32 @wrappedZero()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define internal i32 @wrappedGetInt()
// CHECK: [[INLINEHINT_SSP_UWTABLE:#[0-9]+]] {
// CHECK-LABEL: define internal i32 @zeroRedeclared() #{{[0-9]+}} {
// CHECK-LABEL: define internal i32 @wrappedZeroRedeclared() #{{[0-9]+}} {
// CHECK-LABEL: define internal i32 @staticButNotInline() #{{[0-9]+}} {
// CHECK-LABEL: define internal i32 @innerZero()
@@ -75,7 +74,7 @@ func testStaticButNotInline() -> CInt {
// CHECK-LABEL: declare i32 @getInt()
// CHECK: [[GET_INT_ATTR:#[0-9]+]]
// CHECK: attributes [[SSP]] = { ssp {{.*}} }
// CHECK: attributes [[INLINEHINT_SSP_UWTABLE]] = { inlinehint ssp {{.*}}}
// CHECK: attributes [[SSP]] = { ssp {{.*}} }
// CHECK: attributes [[INNER_ZERO_ATTR]] = { inlinehint nounwind ssp
// CHECK: attributes [[GET_INT_ATTR]] = {