Commit Graph

4518 Commits

Author SHA1 Message Date
Joe Pamer
87be8b13b7 Only favor overload constraints on OverloadedDeclRefs with distinct numbers of parameters. This allows us to keep the previous optimization, while still preserving ambiguity diagnostics.
Swift SVN r24518
2015-01-19 20:59:13 +00:00
Joe Pamer
bd64f7e492 When adding constraints for a ForEach expression, search for generator/element witnesses before creating fresh type variables to represent them.
Swift SVN r24517
2015-01-19 20:59:13 +00:00
Joe Pamer
da7e63cc24 For closure and subscript expressions, if valid contextual information is available use it instead of allocating type variables for their result types.
Swift SVN r24516
2015-01-19 20:59:12 +00:00
Joe Pamer
885ef0de5f When generating constraints for an application of an overloaded function, if all overloads share a common return type, use that type rather than allocating a new type variable.
Swift SVN r24515
2015-01-19 20:59:12 +00:00
Joe Pamer
87cbad9ec1 Improve performance of solving over apply expressions by directly applying the return type whenever possible. This has some nice side-effects:
- Addresses many common user-reported "expression too complex" bugs, including rdar://problem/18876786.
- Shaves up to 10% off of the total time to run our unit tests. (Unscientifically measured on my iMac: 427.46s before, 385.17s after.)

Swift SVN r24514
2015-01-19 20:59:11 +00:00
Chris Willmore
68dd563fbf <rdar://problem/18311362> TLF: Eliminate implicit bridging conversions
Require 'as' when converting from Objective-C type to native type (but
continue to allow implicit conversion from native to Objective-C). This
conversion constraint is called ExplicitConversion; all implicit
conversions are covered by the existing Conversion constraint. Update
standard library and tests to match.

Swift SVN r24496
2015-01-18 00:07:45 +00:00
Graham Batty
057c27f009 Disable existential metatype casting on non-objc.
Also fixes getting the size of an instance of a class to
work without it when objective-c interop is turned off.

Swift SVN r24477
2015-01-16 20:27:54 +00:00
Jordan Rose
a3a6c2695b Put the current target into LangOptions.
This has been long in coming. We always had it in IRGenOpts (in string form).
We had the version number in LangOpts for availability purposes. We had to
pass IRGenOpts to the ClangImporter to actually create the right target.
Some of our semantic checks tested the current OS by looking at the "os"
target configuration! And we're about to need to serialize the target for
debugging purposes.

Swift SVN r24468
2015-01-16 02:48:54 +00:00
Doug Gregor
fea55d98f2 Eliminate dependent types from within archetypes.
When dealing with multiple levels of generic parameters, the mapping
from potential archetypes down to actual archetypes did not have
access to the archetypes for outer generic parameters. When same-type
requirements equated a type from the inner generic parameter list with
one from the outer generic parameter list, the reference to the outer
generic parameter list's type would remain dependent. For example,
given:

  struct S<A: P> {
    init<Q: P where Q.T == A>(_ q: Q) {}
  }

we would end up with the dependent type for A (τ_0_0) in the same-type
constraint in the initializer requirement.

Now, notify the ArchetypeBuilder of outer generic signatures (and,
therefore, outer generic parameters), so that it has knowledge of the
mapping from those generic parameters to the corresponding
archetypes. Use that mapping when translating potential archetypes to
real archetypes. Additionally, when a potential archetype is mapped to
a concrete type (via a same-type constraint to a concrete type),
substitute archetypes for any dependent types within the concrete
type.

Remove a bunch of hacks in the compiler that identified dependent
types in "strange" places and tried to map them back to
archetypes. Those hacks handled some narrow cases we saw in the
standard library and some external code, but papered over the
underlying issue and left major gaps.

Sadly, introduce one hack into the type checker to help with the
matching of generic witnesses to generic requirements that follow the
pattern described above. See ConstraintSystem::SelfTypeVar; the proper
implementation for this matching involves substituting the adoptee
type in for Self within the requirement, and synthesizing new
archetypes from the result.

Fixes rdar://18435371, rdar://18803556, rdar://19082500,
rdar://19245317, rdar://19371678 and a half dozen compiler crashers
from the crash suite. There are a few other radars that I suspect this
fixes, but which require more steps to reproduce.

Swift SVN r24460
2015-01-16 00:27:18 +00:00
David Farler
cad9f99929 Revert "Serialize local types and provide a lookup API"
Changing the design of this to maintain more local context
information and changing the lookup API.

This reverts commit 4f2ff1819064dc61c20e31c7c308ae6b3e6615d0.

Swift SVN r24432
2015-01-15 00:33:10 +00:00
David Farler
fab3d491d9 Serialize local types and provide a lookup API
rdar://problem/18295292

Locally scoped type declarations were previously not serialized into the
module, which meant that the debugger couldn't reason about the
structure of instances of those types.

Introduce a new mangling for local types:
[file basename MD5][counter][identifier]
This allows the demangle node's data to be used directly for lookup
without having to backtrack in the debugger.

Local decls are now serialized into a LOCAL_TYPE_DECLS table in the
module, which acts as the backing hash table for looking up
[file basename MD5][counter][identifier] -> DeclID mappings.

New tests:
* swift-ide-test mode for testing the demangle/lookup/mangle lifecycle
of a module that contains local decls
* mangling
* module merging with local decls

Swift SVN r24426
2015-01-14 22:08:47 +00:00
John McCall
cae0f6e3db Add the ability for a owning addressor to return
a non-native owner.  This is required by Slice, which
will use an ObjC immutable array object as the owner
as long as all the elements are contiguous.

As part of this, I decided it was best to encode the
native requirement in the accessor names.  This makes
some of these accessors really long; we can revisit this
if we productize this feature.

Note that pinning addressors still require a native
owner, since pinning as a feature is specific to swift
refcounting.

Swift SVN r24420
2015-01-14 19:14:20 +00:00
Doug Gregor
420b35a887 If we don't have a type witness already, use name lookup to look for one first.
This eliminates an ordering dependency with associated type inference
that I've not been able to tickle (found by inspection).

Swift SVN r24408
2015-01-14 01:04:21 +00:00
Doug Gregor
562b529d7a Start simplifying the "dependent type opener" contract.
The archetype opener only needs to perform basic substitutions; let it
do so, avoiding the creation of a pile of type variables that simply
get immediately bound.

Swift SVN r24399
2015-01-13 23:17:52 +00:00
Doug Gregor
caf3b9b0a2 Kill WitnessTypeOpener; it's inert and confusing.
Swift SVN r24398
2015-01-13 23:17:51 +00:00
John McCall
6a46350546 Bugfixes for the new addressor kinds.
Permit non-Ordinary accesses on references to functions,
with the semantics of devirtualizing the call if the
function is a class member.  This is important for
constructing direct call to addressors from synthesized
materializeForSet accessors: for one, it's more
performant, and for another, addressors do not currently
appear in v-tables.

Synthesize trivial accessors for addressed class members.
We weren't doing this at all before, and I'm still not
sure we're doing it right in all cases.  This is a mess.

Assorted other fixes.  The new addressor kinds seem
to work now.

Swift SVN r24393
2015-01-13 10:37:22 +00:00
John McCall
dc4431ebff Split addressors into unsafe, owning, and pinning variants.
Change all the existing addressors to the unsafe variant.

Update the addressor mangling to include the variant.

The addressor and mutable-addressor may be any of the
variants, independent of the choice for the other.

SILGen and code synthesis for the new variants is still
untested.

Swift SVN r24387
2015-01-13 03:09:16 +00:00
John McCall
f3dc58667d Improve the typing of materializeForSet callbacks to
use a thin function type.

We still need thin-function-to-RawPointer conversions
for generic code, but that's fixable with some sort of
partial_apply_thin_recoverable instruction.

Swift SVN r24364
2015-01-11 21:13:35 +00:00
David Farler
7d316d100a Improve diagnostics for static stored properties
Append "did you mean 'static'?" when hitting the unimplemented class
stored properties diagnostic in a class context.

Provide a fix-it for typing "static final" in a class, which is
redundant.

Swift SVN r24358
2015-01-11 02:16:58 +00:00
Doug Gregor
376c39bc74 Add test for rdar://problem/17855378
Swift SVN r24356
2015-01-10 05:48:43 +00:00
Doug Gregor
16927ccb3d Revert "Move the computation of generic signatures into the archetype builder."
This reverts commit r23030.

This puts non-primary archetypes back in the all-archetypes list,
which is the deepest underlying problem behind
rdar://problem/19049566.

Conflicts:
	lib/AST/ArchetypeBuilder.cpp
	validation-test/compiler_crashers/0033-error.swift
	validation-test/compiler_crashers/035-multiple-typecheck-segfault.swift

Swift SVN r24333
2015-01-09 23:19:28 +00:00
Doug Gregor
55ed344e84 Revert "Remove requirement-collection and generic signature creation logic from Sema."
This reverts r23031; we're going to rely on this older logic a bit longer.

Swift SVN r24332
2015-01-09 23:19:24 +00:00
David Farler
567fd12e80 Don't allow 'class final' spelled stored properties in classed
The previous patch to allow static class stored properties
inadvertently allowed 'class final' spellings for static
stored properties in classes. This patch only allows 'static'
spellings to create the global storage.

Swift SVN r24323
2015-01-09 20:40:36 +00:00
David Farler
3530e542ca Static class stored properties
rdar://problem/19422120

Allow static/class final stored properties to get through to the
mangled global property implementations.

Swift SVN r24303
2015-01-09 09:54:18 +00:00
David Farler
87c3d7421f Refine static func and var syntax
rdar://problem/17198298

- Allow 'static' in protocol property and func requirements, but not 'class'.
- Allow 'static' methods in classes - they are 'class final'.
- Only allow 'class' methods in classes (or extensions of classes)
- Remove now unneeded diagnostics related to finding 'static' in previously banned places.
- Update relevant diagnostics to make the new rules clear.

Swift SVN r24260
2015-01-08 03:03:29 +00:00
Chris Willmore
03a6190a1f <rdar://problem/19031957> Change failable casts from "as" to "as!"
Previously the "as" keyword could either represent coercion or or forced
downcasting. This change separates the two notions. "as" now only means
type conversion, while the new "as!" operator is used to perform forced
downcasting. If a program uses "as" where "as!" is called for, we emit a
diagnostic and fixit.

Internally, this change removes the UnresolvedCheckedCastExpr class, in
favor of directly instantiating CoerceExpr when parsing the "as"
operator, and ForcedCheckedCastExpr when parsing the "as!" operator.

Swift SVN r24253
2015-01-08 00:33:59 +00:00
Joe Pamer
8d971d659c When checking a sub-expression independently of its parent to produce a diagnostic, a new expression node may be produced. Should that occur, reset the original node's type to that of the new node. This ensures that type variable data created for the temporary system does not leak outwards. (Addresses rdar://problem/19235186 and rdar://problem/19349724 to bring the ASAN Jenkins build online.)
Swift SVN r24241
2015-01-07 20:31:22 +00:00
Chris Lattner
763bb6386f Implement parser, AST representation, type checker, etc support for generalized
if-let statements (also while and var, of course) that include multiple bindings
and where clauses.

SILGen support still remains, it currently just asserts on the new constructs.



Swift SVN r24239
2015-01-07 07:03:02 +00:00
Nadav Rotem
636c6bdf2b Use =default for the default destructor.
Swift SVN r24228
2015-01-06 23:27:36 +00:00
Chris Lattner
3e41339cb2 rename @__noescape to @noescape, now that it is a generally visible feature,
wrapping up rdar://16323038.  Pieces still remaining are a Clang attribute+
importer support for it, plus adoption in the stdlib (tracked by other radars).


Swift SVN r24223
2015-01-06 22:54:25 +00:00
Chris Lattner
696749d819 Three things:
- Make @autoclosure imply @__noescape everywhere, not just in the stdlib.
 - Change various noescape diagnostics to refer to "parameters", not "arguments" of the function.
 - Teach the noescape diagnostics to notice if the noescape problem is due to an
   @autoclosure argument that is implicitly noescape.  In this case, produce a helpful note
   that indicates that the invalid use of the noescape is due to the autoclosure implying it.



Swift SVN r24222
2015-01-06 22:40:24 +00:00
Chris Lattner
1d74ed7485 teach the compiler how to handle @__noescape in SIL files, allowing SIL to roundtrip it
correctly.  This should fix validation/parser/parse_stdlib.sil


Swift SVN r24220
2015-01-06 22:10:13 +00:00
Nadav Rotem
efd3495f60 Add a virtual dtor to silence a warning.
Swift SVN r24217
2015-01-06 22:02:57 +00:00
Chris Lattner
d0836b8466 reapply r24143:
Make @autoclosure imply @__noescape as described in rdar://18447257. This is currently  limited to the stdlib only right now, since @__noescape isn't a user visible feature and implying it would make it user visible.

This has no effect other than enforcing limitations on the stdlib that it doesn't currently break.
More interesting pieces coming soon.


Swift SVN r24210
2015-01-06 06:11:55 +00:00
Dmitri Hrybenko
9182afc545 Revert "Make @autoclosure imply @__noescape as described in rdar://18447257. This is currently "
Even though the tests were broken by r24141, now that there are more
commits on top of it, reverting just r24141 does not fix tests.  I'm
reverting r24141, r24142 and r24143.

Swift SVN r24150
2014-12-24 07:23:10 +00:00
Chris Lattner
e9d2e02ac7 Make @autoclosure imply @__noescape as described in rdar://18447257. This is currently
limited to the stdlib only right now, since @__noescape isn't a user visible feature
and implying it would make it user visible.



Swift SVN r24143
2014-12-24 01:58:11 +00:00
Chris Lattner
fcdb304bc4 Implicit conversions of noescape pointers are ok when they add qualifiers.
XCTest needs this.



Swift SVN r24139
2014-12-24 00:57:07 +00:00
Chris Lattner
58e0efc345 Enhance getDeclCaptureKind() to take the closure that is capturing the
given decl, and plumb the information down to it.  NFC since the argument
is currently dead.



Swift SVN r24132
2014-12-23 23:08:38 +00:00
Chris Lattner
3578c7fde0 Teach the type checker about subtype relationships of noescape, and use this
to allow passing off a no-escape formal parameter to the argument of a 
noescape parameter call.



Swift SVN r24126
2014-12-23 22:18:09 +00:00
Dmitri Hrybenko
6670bb76ec Rewrite the CMake build system
Swift SVN r24124
2014-12-23 22:15:30 +00:00
John McCall
44eec49842 Change the signature of materializeForSet to return an
optional callback; retrofit existing implementations.

There's a lot of unpleasant traffic in raw pointers here
which I'm going to try to clean up.

Swift SVN r24123
2014-12-23 22:14:38 +00:00
Chris Lattner
a87028e57c Reject uses of noescape parameters that would cause them to escape. Namely, we only
allow the parameter to be caller, or captured by another no-escape closure.


Swift SVN r24121
2014-12-23 21:12:29 +00:00
Chris Lattner
1486238412 Reapply:
propagate the no-escape bit from a parameter into a closure-expr argument.  When a 
ClosureExpr is thus inferred to be non-escape, disable the "self." requirement.

.. with fixes.  Thanks again to Dmitri for reverting + adding testcase.



Swift SVN r24115
2014-12-23 18:21:14 +00:00
Chris Lattner
21a7a6c89a Doug twisted my arm and convinced me that noescape was a better match for the semantics we’ll have here. NoCapture would be confusable with "this closure doesn’t have any captures, thus should be compatible with thin function types"
The attribute itself remains __'ized.



Swift SVN r24113
2014-12-23 17:52:10 +00:00
Dmitri Hrybenko
7ef8a95f8c Revert "propagate the no-capture bit from a parameter into a
closure-expr argument.  When a "

This reverts commit r24085.  It causes crashes in the validation
testsuite even with r24094.  Testcase:

    var x = { f: Int {} }

Swift SVN r24102
2014-12-23 04:06:15 +00:00
Dmitri Hrybenko
e6a7e49081 Revert "fix a problem in my previous patch, which would cause it to
crash on ClosureExpr's that"

This reverts commit r24094.  It depends on r24085, which I'm reverting.

Swift SVN r24101
2014-12-23 04:06:14 +00:00
Chris Lattner
0eaeda9136 rework & cleanup diagModuleOrMetatypeValue, renaming it to diagSyntacticUseRestrictions
in preparation to extend it.  NFC except for a cleanup of the dynamicType diagnostic.


Swift SVN r24095
2014-12-23 01:14:41 +00:00
Chris Lattner
94f5449e43 fix a problem in my previous patch, which would cause it to crash on ClosureExpr's that
have ErrorType.  This caused regressions in the testsuite :(


Swift SVN r24094
2014-12-23 00:54:40 +00:00
Chris Lattner
410c3ef431 propagate the no-capture bit from a parameter into a closure-expr argument. When a
ClosureExpr is thus inferred to be non-captured, disable the "self." requirement.


Swift SVN r24085
2014-12-22 23:58:39 +00:00
Connor Wakamo
6c11ab65ea Switch from an llvm::PointerIntPair to manually handling storage and storedKind in ConstraintLocator::PathElement.
The previous approach -- which attempted to put an llvm::Fixnum<52> into an
llvm::PointerUnion -- failed to compile for 32-bit platforms. This approach now
explicitly uses 62 bits of a uint64_t for storing either an ArchetypeType * or
an llvm::Fixnum<62>, using the remaining 2 bits to store what kind of value is
in storage.

This fixes <rdar://problem/19283881>.

Swift SVN r24084
2014-12-22 23:23:14 +00:00