Skip to content

Commit

Permalink
Merge pull request #8059 from CodaFi/initial-value-problem
Browse files Browse the repository at this point in the history
  • Loading branch information
@swift-ci
swift-ci committed Mar 14, 2017
2 parents 5c0165f + 1367b0c commit dced34a
Show file tree
Hide file tree
Showing 25 changed files with 31 additions and 32 deletions.
10 changes: 7 additions & 3 deletions lib/Sema/TypeCheckStmt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1441,10 +1441,14 @@ static void checkDefaultArguments(TypeChecker &tc,
->changeResilienceExpansion(expansion);

// Type-check the initializer, then flag that we did so.
if (!tc.typeCheckExpression(e, initContext,
TypeLoc::withoutLoc(param->getType()),
CTP_DefaultParameter))
bool hadError = tc.typeCheckExpression(e, initContext,
TypeLoc::withoutLoc(param->getType()),
CTP_DefaultParameter);
if (!hadError) {
param->setDefaultValue(e);
} else {
param->setDefaultValue(nullptr);
}

tc.checkInitializerErrorHandling(initContext, e);

Expand Down
2 changes: 1 addition & 1 deletion ...ift-type-llvm-smallptrset-swift-arc.swift → ...ift-type-llvm-smallptrset-swift-arc.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
func t(UInt=1 + 1 as?Int){
2 changes: 1 addition & 1 deletion ...uted-at-swift-lib-ast-type-cpp-1137.swift → ...uted-at-swift-lib-ast-type-cpp-1137.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{ struct A{
p.init(UInt=1 + 1 as?Int){
3 changes: 1 addition & 2 deletions ...s/28658-result-case-not-implemented.swift → ...d/28658-result-case-not-implemented.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
s a){func a(UInt=1 + 1 + 1 as?Int){
2 changes: 1 addition & 1 deletion ...661-swift-typebase-getcanonicaltype.swift → ...661-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{func b(UInt=1 + 1 + 1 as?Int?){class d a{
2 changes: 1 addition & 1 deletion ...hecktype-swift-type-swift-sourceloc.swift → ...hecktype-swift-type-swift-sourceloc.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
let x[{{{{{{{{{{{{{{{{{{{{{{{{struct c{func b(UInt=1 + 1 + 1 + 1 + 1 as?Int){{{{{{{{{{{{struct P
3 changes: 1 addition & 2 deletions ...erarena-no-constraint-solver-active.swift → ...erarena-no-constraint-solver-active.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
nt){{func t(UInt=1 + 1 + 1 as?Int){{{{{[._{
2 changes: 1 addition & 1 deletion ...cantype-out-of-a-non-canonical-type.swift → ...cantype-out-of-a-non-canonical-type.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{{{{{{{func t(UInt=1 + 1 as?Int){{{{
2 changes: 1 addition & 1 deletion ...679-swift-typebase-getcanonicaltype.swift → ...679-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{struct A{func b(UInt=1 + 1 + 1 as?Int){{{
2 changes: 1 addition & 1 deletion ...681-swift-typebase-getcanonicaltype.swift → ...681-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
d}func a(UInt=1 + 1 as?Int){{{{{{{{{{{{func b(UInt=1 + 1 + 1 + 1 as?Int){{{{{{{{{{{{{{(a{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
3 changes: 1 addition & 2 deletions ...cantype-out-of-a-non-canonical-type.swift → ...cantype-out-of-a-non-canonical-type.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{{{func t(UInt=1 + 1 + 1 + 1 as?Int){{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{$0{{{{{{{{{{{{{{{{{{{{{{{{
3 changes: 1 addition & 2 deletions ...cantype-out-of-a-non-canonical-type.swift → ...cantype-out-of-a-non-canonical-type.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{struct A{func b(UInt=1 + 1 as?Int){{
2 changes: 1 addition & 1 deletion ...uted-at-swift-lib-ast-type-cpp-1349.swift → ...uted-at-swift-lib-ast-type-cpp-1349.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{==a
extension{func c(UInt=1 + 1 + 1 + 1 as?Int){
2 changes: 1 addition & 1 deletion ...uted-at-swift-lib-ast-type-cpp-1351.swift → ...uted-at-swift-lib-ast-type-cpp-1351.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
u
func o(UInt=1 + 1 as?Int){r
2 changes: 1 addition & 1 deletion ...696-swift-typebase-getcanonicaltype.swift → ...696-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{func b(UInt=1 + 1 + 1 + 1 + 1 as?Int){a
2 changes: 1 addition & 1 deletion ...699-swift-typebase-getcanonicaltype.swift → ...699-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
==1 C:{func b(UInt=1 + 1 + 1 as?Int){a==A(
2 changes: 1 addition & 1 deletion ...703-swift-typebase-getdesugaredtype.swift → ...703-swift-typebase-getdesugaredtype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
func b(UInt=1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 as?Int){a
2 changes: 1 addition & 1 deletion ...705-swift-typebase-getcanonicaltype.swift → ...705-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{
struct c{}func t(UInt= 1 + 1 + 1 + 1 as?Int){
{{
Expand Down
2 changes: 1 addition & 1 deletion ...uted-at-swift-lib-ast-type-cpp-1005.swift → ...uted-at-swift-lib-ast-type-cpp-1005.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{
class C{func o(UInt=1 + 1 + 1 + 1 + 1 as?Int){{
{r
Expand Down
2 changes: 1 addition & 1 deletion ...hecktype-swift-type-swift-sourceloc.swift → ...hecktype-swift-type-swift-sourceloc.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{struct A{func a(UInt=1 + 1 + 1 + 1 as?Int){{
protocol r
protocol A
Expand Down
2 changes: 1 addition & 1 deletion ...712-swift-typebase-getcanonicaltype.swift → ...712-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{struct B{func o(UInt=_=1 + 1 + 1 + 1 as?Int){a f{{A
2 changes: 1 addition & 1 deletion ...713-swift-typebase-getdesugaredtype.swift → ...713-swift-typebase-getdesugaredtype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
struct A{
func a
func o(UInt=1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 as?Int){a f=1 1?{_=(
2 changes: 1 addition & 1 deletion ...cantype-out-of-a-non-canonical-type.swift → ...cantype-out-of-a-non-canonical-type.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
a<
func a
{
Expand Down
3 changes: 1 addition & 2 deletions ...uted-at-swift-lib-ast-type-cpp-1215.swift → ...uted-at-swift-lib-ast-type-cpp-1215.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: OS=linux-gnu
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
func o(UInt=_=1 + 1 t){a
2 changes: 1 addition & 1 deletion ...718-swift-typebase-getcanonicaltype.swift → ...718-swift-typebase-getcanonicaltype.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
n
func{(struct A{func b(Int=1 + 1 + 1 as?Int?){a

0 comments on commit dced34a

Please sign in to comment.