Merge pull request #15465 from jckarter/objc-override-nil
SILGen: Guard against unexpected nulls passed into ObjC overrides.
diff --git a/benchmark/scripts/Benchmark_QuickCheck.in b/benchmark/scripts/Benchmark_QuickCheck.in
index 42e9511..0599d9e 100644
--- a/benchmark/scripts/Benchmark_QuickCheck.in
+++ b/benchmark/scripts/Benchmark_QuickCheck.in
@@ -41,15 +41,16 @@
class QuickCheckBenchmarkDriver(perf_test_driver.BenchmarkDriver):
- def __init__(self, binary, xfail_list, num_iters):
+ def __init__(self, binary, xfail_list, num_iters, opt_levels):
perf_test_driver.BenchmarkDriver.__init__(
self, binary, xfail_list,
- enable_parallel=True)
+ enable_parallel=True,
+ opt_levels=opt_levels)
self.num_iters = num_iters
def print_data_header(self, max_test_len):
- fmt = '{:<%d}{:<10}{:}' % (max_test_len + 5)
- print(fmt.format('Name', 'Result', 'RC Delta'))
+ fmt = '{:<%d}{:<10}' % (max_test_len + 5)
+ print(fmt.format('Name', 'Result'))
# Propagate any data from this class that is needed for individual
# tests. The reason this is needed is to avoid issues with attempting to
@@ -99,15 +100,21 @@
import argparse
parser = argparse.ArgumentParser()
parser.add_argument(
- '-filter', type=str, default=None,
+ '--filter', type=str, default=None,
help='Filter out any test that does not match the given regex')
- parser.add_argument('-num-iters', type=int, default=2)
+ parser.add_argument('--num-iters', type=int, default=2)
+ default_opt_levels = perf_test_driver.BenchmarkDriver_OptLevels
+ parser.add_argument('--opt-level', choices=default_opt_levels)
return parser.parse_args()
if __name__ == "__main__":
args = parse_args()
- l = QuickCheckBenchmarkDriver(SWIFT_BIN_DIR, XFAIL_LIST, args.num_iters)
+ opt_levels = perf_test_driver.BenchmarkDriver_OptLevels
+ if args.opt_level is not None:
+ opt_levels = [args.opt_level]
+ l = QuickCheckBenchmarkDriver(SWIFT_BIN_DIR, XFAIL_LIST, args.num_iters,
+ opt_levels)
if l.run(args.filter):
sys.exit(0)
else:
diff --git a/docs/StandardLibraryProgrammersManual.md b/docs/StandardLibraryProgrammersManual.md
index 3318415..558e973 100644
--- a/docs/StandardLibraryProgrammersManual.md
+++ b/docs/StandardLibraryProgrammersManual.md
@@ -170,3 +170,23 @@
3. If the field is not trivially destructable, update `_destroyTLS` to properly destroy the value.
See [ThreadLocalStorage.swift](https://github.com/apple/swift/blob/master/stdlib/public/core/ThreadLocalStorage.swift) for more details.
+
+## Productivity Hacks
+
+### Be a Ninja
+
+To *be* a productivity ninja, one must *use* `ninja`. `ninja` can be invoked inside the swift build directory, e.g. `<path>/build/Ninja-ReleaseAssert/swift-macosx-x86_64/`. Running `ninja` (which is equivalent to `ninja all`) will build the local swift, stdlib and overlays. It doesn’t necessarily build all the testing infrastructure, benchmarks, etc.
+
+`ninja -t targets` gives a list of all possible targets to pass to ninja. This is useful for grepping.
+
+For this example, we will figure out how to quickly iterate on a change to the standard library to fix 32-bit build errors while building on a 64-bit host, suppressing warnings along the way.
+
+`ninja -t targets | grep stdlib | grep i386` will output many targets, but at the bottom we see `swift-stdlib-iphonesimulator-i386`, which looks like a good first step. This target will just build i386 parts and not waste our time also building the 64-bit stdlib, overlays, etc.
+
+Going further, ninja can spawn a web browser for you to navigate dependencies and rules. `ninja -t browse swift-stdlib-iphonesimulator-i386` will open a webpage with hyperlinks for all related targets. “target is built using” lists all this target’s dependencies, while “dependent edges build” list all the targets that depend directly on this.
+
+Clicking around a little bit, we can find `lib/swift/iphonesimulator/i386/libswiftCore.dylib` as a commonly-depended-upon target. This will perform just what is needed to compile the standard library for i386 and nothing else.
+
+Going further, for various reasons the standard library has lots of warnings. This is actively being addressed, but fixing all of them may require language features, etc. In the mean time, let’s suppress warnings in our build so that we just see the errors. `ninja -nv lib/swift/iphonesimulator/i386/libswiftCore.dylib` will show us the actual commands ninja will issue to build the i386 stdlib. (You’ll notice that an incremental build here is merely 3 commands as opposed to ~150 for `swift-stdlib-iphonesimulator-i386`).
+
+Copy the invocation that has ` -o <build-path>/swift-macosx-x86_64/stdlib/public/core/iphonesimulator/i386/Swift.o`, so that we can perform the actual call to swiftc ourselves. Tack on `-suppress-warnings` at the end, and now we have the command to just build `Swift.o` for i386 while only displaying the actual errors.
diff --git a/include/swift/ABI/MetadataValues.h b/include/swift/ABI/MetadataValues.h
index cc0922b..9bc0cd8 100644
--- a/include/swift/ABI/MetadataValues.h
+++ b/include/swift/ABI/MetadataValues.h
@@ -980,6 +980,27 @@
return uintptr_t(flags) & uintptr_t(StructLayoutFlags::IsVWTMutable);
}
+/// Flags for class layout.
+enum class ClassLayoutFlags : uintptr_t {
+ /// Reserve space for 256 layout algorithms.
+ AlgorithmMask = 0xff,
+
+ /// The ABI baseline algorithm, i.e. the algorithm implemented in Swift 5.
+ Swift5Algorithm = 0x00,
+};
+static inline ClassLayoutFlags operator|(ClassLayoutFlags lhs,
+ ClassLayoutFlags rhs) {
+ return ClassLayoutFlags(uintptr_t(lhs) | uintptr_t(rhs));
+}
+static inline ClassLayoutFlags &operator|=(ClassLayoutFlags &lhs,
+ ClassLayoutFlags rhs) {
+ return (lhs = (lhs | rhs));
+}
+static inline ClassLayoutFlags getLayoutAlgorithm(ClassLayoutFlags flags) {
+ return ClassLayoutFlags(uintptr_t(flags)
+ & uintptr_t(ClassLayoutFlags::AlgorithmMask));
+}
+
/// Flags for enum layout.
enum class EnumLayoutFlags : uintptr_t {
/// Reserve space for 256 layout algorithms.
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
index d0c13bd..e76307f 100644
--- a/include/swift/AST/Decl.h
+++ b/include/swift/AST/Decl.h
@@ -65,7 +65,6 @@
class GenericTypeParamType;
class LazyResolver;
class ModuleDecl;
- class NameAliasType;
class EnumCaseDecl;
class EnumElementDecl;
class ParameterList;
diff --git a/include/swift/AST/GenericEnvironment.h b/include/swift/AST/GenericEnvironment.h
index 85c2892..6d9997a 100644
--- a/include/swift/AST/GenericEnvironment.h
+++ b/include/swift/AST/GenericEnvironment.h
@@ -150,6 +150,19 @@
/// abstraction level of their associated type requirements.
SILType mapTypeIntoContext(SILModule &M, SILType type) const;
+ /// Map an interface type's protocol conformance into the corresponding
+ /// conformance for the contextual type.
+ static std::pair<Type, ProtocolConformanceRef>
+ mapConformanceRefIntoContext(GenericEnvironment *genericEnv,
+ Type conformingType,
+ ProtocolConformanceRef conformance);
+
+ /// Map an interface type's protocol conformance into the corresponding
+ /// conformance for the contextual type.
+ std::pair<Type, ProtocolConformanceRef>
+ mapConformanceRefIntoContext(Type conformingType,
+ ProtocolConformanceRef conformance) const;
+
/// Get the sugared form of a generic parameter type.
GenericTypeParamType *getSugaredType(GenericTypeParamType *type) const;
diff --git a/include/swift/AST/Module.h b/include/swift/AST/Module.h
index fff2492..43a7c25 100644
--- a/include/swift/AST/Module.h
+++ b/include/swift/AST/Module.h
@@ -62,7 +62,6 @@
class LinkLibrary;
class LookupCache;
class ModuleLoader;
- class NameAliasType;
class NominalTypeDecl;
class EnumElementDecl;
class OperatorDecl;
diff --git a/include/swift/AST/ProtocolConformanceRef.h b/include/swift/AST/ProtocolConformanceRef.h
index b373a15..327a916 100644
--- a/include/swift/AST/ProtocolConformanceRef.h
+++ b/include/swift/AST/ProtocolConformanceRef.h
@@ -133,6 +133,11 @@
/// Get any additional requirements that are required for this conformance to
/// be satisfied.
ArrayRef<Requirement> getConditionalRequirements() const;
+
+ /// If this is a conformance reference for a protocol that inherits other
+ /// protocols, get a reference to the related conformance for the inherited
+ /// protocol.
+ ProtocolConformanceRef getInheritedConformanceRef(ProtocolDecl *base) const;
};
} // end namespace swift
diff --git a/include/swift/AST/TypeNodes.def b/include/swift/AST/TypeNodes.def
index 7a61121..5392c8e 100644
--- a/include/swift/AST/TypeNodes.def
+++ b/include/swift/AST/TypeNodes.def
@@ -146,7 +146,6 @@
ABSTRACT_SUGARED_TYPE(Sugar, Type)
SUGARED_TYPE(Paren, SugarType)
SUGARED_TYPE(NameAlias, SugarType)
- SUGARED_TYPE(BoundNameAlias, SugarType)
ABSTRACT_SUGARED_TYPE(SyntaxSugar, SugarType)
ABSTRACT_SUGARED_TYPE(UnarySyntaxSugar, SyntaxSugarType)
SUGARED_TYPE(ArraySlice, UnarySyntaxSugarType)
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
index 77b6621..ccf6ed2 100644
--- a/include/swift/AST/Types.h
+++ b/include/swift/AST/Types.h
@@ -373,7 +373,7 @@
GenericArgCount : 32
);
- SWIFT_INLINE_BITFIELD_FULL(BoundNameAliasType, SugarType, 1+16,
+ SWIFT_INLINE_BITFIELD_FULL(NameAliasType, SugarType, 1+16,
: NumPadBits,
/// Whether we have a parent type.
@@ -1512,8 +1512,8 @@
SugarType(TypeKind K, const ASTContext *ctx,
RecursiveTypeProperties properties)
: TypeBase(K, nullptr, properties), Context(ctx) {
- if (K != TypeKind::NameAlias)
- assert(ctx != nullptr && "Context for SugarType should not be null");
+ assert(ctx != nullptr &&
+ "Context for SugarType should not be null");
Bits.SugarType.HasCachedType = false;
}
@@ -1548,49 +1548,32 @@
}
};
-/// NameAliasType - An alias type is a name for another type, just like a
-/// typedef in C.
-class NameAliasType : public SugarType {
- friend class TypeAliasDecl;
- // NameAliasType are never canonical.
- NameAliasType(TypeAliasDecl *d)
- : SugarType(TypeKind::NameAlias, (ASTContext*)nullptr,
- RecursiveTypeProperties()),
- TheDecl(d) {}
- TypeAliasDecl *const TheDecl;
-
-public:
- TypeAliasDecl *getDecl() const { return TheDecl; }
-
- using TypeBase::setRecursiveProperties;
-
- // Implement isa/cast/dyncast/etc.
- static bool classof(const TypeBase *T) {
- return T->getKind() == TypeKind::NameAlias;
- }
-};
-
/// A reference to a type alias that is somehow generic, along with the
/// set of substitutions to apply to make the type concrete.
-class BoundNameAliasType final
+class NameAliasType final
: public SugarType, public llvm::FoldingSetNode,
- llvm::TrailingObjects<BoundNameAliasType, Type, Substitution>
+ llvm::TrailingObjects<NameAliasType, Type, GenericSignature *,
+ Substitution>
{
TypeAliasDecl *typealias;
friend class ASTContext;
friend TrailingObjects;
- BoundNameAliasType(TypeAliasDecl *typealias, Type parent,
+ NameAliasType(TypeAliasDecl *typealias, Type parent,
const SubstitutionMap &substitutions, Type underlying,
RecursiveTypeProperties properties);
unsigned getNumSubstitutions() const {
- return Bits.BoundNameAliasType.NumSubstitutions;
+ return Bits.NameAliasType.NumSubstitutions;
}
size_t numTrailingObjects(OverloadToken<Type>) const {
- return Bits.BoundNameAliasType.HasParent ? 1 : 0;
+ return Bits.NameAliasType.HasParent ? 1 : 0;
+ }
+
+ size_t numTrailingObjects(OverloadToken<GenericSignature *>) const {
+ return getNumSubstitutions() > 0 ? 1 : 0;
}
size_t numTrailingObjects(OverloadToken<Substitution>) const {
@@ -1603,8 +1586,15 @@
return {getTrailingObjects<Substitution>(), getNumSubstitutions()};
}
+ /// Retrieve the generic signature used for substitutions.
+ GenericSignature *getGenericSignature() const {
+ return getNumSubstitutions() > 0
+ ? *getTrailingObjects<GenericSignature *>()
+ : nullptr;
+ }
+
public:
- static BoundNameAliasType *get(TypeAliasDecl *typealias, Type parent,
+ static NameAliasType *get(TypeAliasDecl *typealias, Type parent,
const SubstitutionMap &substitutions,
Type underlying);
@@ -1617,7 +1607,7 @@
/// Retrieve the parent of this type as written, e.g., the part that was
/// written before ".", if provided.
Type getParent() const {
- return Bits.BoundNameAliasType.HasParent ? *getTrailingObjects<Type>()
+ return Bits.NameAliasType.HasParent ? *getTrailingObjects<Type>()
: Type();
}
@@ -1637,11 +1627,12 @@
void Profile(llvm::FoldingSetNodeID &id) const;
static void Profile(llvm::FoldingSetNodeID &id, TypeAliasDecl *typealias,
- Type parent, const SubstitutionMap &substitutions);
+ Type parent, const SubstitutionMap &substitutions,
+ Type underlying);
// Implement isa/cast/dyncast/etc.
static bool classof(const TypeBase *T) {
- return T->getKind() == TypeKind::BoundNameAlias;
+ return T->getKind() == TypeKind::NameAlias;
}
};
diff --git a/include/swift/Basic/Version.h b/include/swift/Basic/Version.h
index 25fff6f..6c46eb2 100644
--- a/include/swift/Basic/Version.h
+++ b/include/swift/Basic/Version.h
@@ -119,6 +119,9 @@
/// Return this Version struct with minor and sub-minor components stripped
Version asMajorVersion() const;
+ /// Return this Version struct as the appropriate version string for APINotes.
+ std::string asAPINotesVersionString() const;
+
/// Parse a version in the form used by the _compiler_version \#if condition.
static Optional<Version> parseCompilerVersionString(StringRef VersionString,
SourceLoc Loc,
@@ -143,8 +146,8 @@
// List of backward-compatibility versions that we permit passing as
// -swift-version <vers>
- static std::array<StringRef, 3> getValidEffectiveVersions() {
- return {{"3", "4", "5"}};
+ static std::array<StringRef, 4> getValidEffectiveVersions() {
+ return {{"3", "4", "4.2", "5"}};
};
};
diff --git a/include/swift/Driver/Action.h b/include/swift/Driver/Action.h
index 9d422e2..28dee31 100644
--- a/include/swift/Driver/Action.h
+++ b/include/swift/Driver/Action.h
@@ -38,7 +38,7 @@
using iterator = ArrayRef<const Action *>::iterator;
using const_iterator = ArrayRef<const Action *>::const_iterator;
- enum ActionClass {
+ enum class Kind : unsigned {
Input = 0,
CompileJob,
InterpretJob,
@@ -52,14 +52,14 @@
VerifyDebugInfoJob,
GeneratePCHJob,
- JobFirst=CompileJob,
- JobLast=GeneratePCHJob
+ JobFirst = CompileJob,
+ JobLast = GeneratePCHJob
};
- static const char *getClassName(ActionClass AC);
+ static const char *getClassName(Kind AC);
private:
- unsigned Kind : 4;
+ unsigned RawKind : 4;
unsigned Type : 28;
friend class Compilation;
@@ -67,8 +67,9 @@
void *operator new(size_t size) { return ::operator new(size); };
protected:
- Action(ActionClass Kind, file_types::ID Type) : Kind(Kind), Type(Type) {
- assert(Kind == getKind() && "not enough bits");
+ Action(Kind K, file_types::ID Type)
+ : RawKind(unsigned(K)), Type(Type) {
+ assert(K == getKind() && "not enough bits");
assert(Type == getType() && "not enough bits");
}
@@ -77,7 +78,7 @@
const char *getClassName() const { return Action::getClassName(getKind()); }
- ActionClass getKind() const { return static_cast<ActionClass>(Kind); }
+ Kind getKind() const { return static_cast<Kind>(RawKind); }
file_types::ID getType() const { return static_cast<file_types::ID>(Type); }
};
@@ -87,11 +88,11 @@
public:
InputAction(const llvm::opt::Arg &Input, file_types::ID Type)
- : Action(Action::Input, Type), Input(Input) {}
+ : Action(Action::Kind::Input, Type), Input(Input) {}
const llvm::opt::Arg &getInputArg() const { return Input; }
static bool classof(const Action *A) {
- return A->getKind() == Action::Input;
+ return A->getKind() == Action::Kind::Input;
}
};
@@ -99,7 +100,7 @@
TinyPtrVector<const Action *> Inputs;
virtual void anchor();
protected:
- JobAction(ActionClass Kind, ArrayRef<const Action *> Inputs,
+ JobAction(Kind Kind, ArrayRef<const Action *> Inputs,
file_types::ID Type)
: Action(Kind, Type), Inputs(Inputs) {}
@@ -120,8 +121,8 @@
virtual size_t getInputIndex() const { return 0; }
static bool classof(const Action *A) {
- return (A->getKind() >= ActionClass::JobFirst &&
- A->getKind() <= ActionClass::JobLast);
+ return (A->getKind() >= Kind::JobFirst &&
+ A->getKind() <= Kind::JobLast);
}
};
@@ -152,17 +153,19 @@
public:
CompileJobAction(file_types::ID OutputType)
- : JobAction(Action::CompileJob, None, OutputType), inputInfo() {}
+ : JobAction(Action::Kind::CompileJob, None, OutputType),
+ inputInfo() {}
CompileJobAction(Action *Input, file_types::ID OutputType, InputInfo info)
- : JobAction(Action::CompileJob, Input, OutputType), inputInfo(info) {}
+ : JobAction(Action::Kind::CompileJob, Input, OutputType),
+ inputInfo(info) {}
InputInfo getInputInfo() const {
return inputInfo;
}
static bool classof(const Action *A) {
- return A->getKind() == Action::CompileJob;
+ return A->getKind() == Action::Kind::CompileJob;
}
};
@@ -172,10 +175,11 @@
public:
explicit InterpretJobAction()
- : JobAction(Action::InterpretJob, llvm::None, file_types::TY_Nothing) {}
+ : JobAction(Action::Kind::InterpretJob, llvm::None,
+ file_types::TY_Nothing) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::InterpretJob;
+ return A->getKind() == Action::Kind::InterpretJob;
}
};
@@ -190,10 +194,10 @@
public:
BackendJobAction(const Action *Input, file_types::ID OutputType,
size_t InputIndex)
- : JobAction(Action::BackendJob, Input, OutputType),
+ : JobAction(Action::Kind::BackendJob, Input, OutputType),
InputIndex(InputIndex) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::BackendJob;
+ return A->getKind() == Action::Kind::BackendJob;
}
virtual size_t getInputIndex() const { return InputIndex; }
@@ -211,13 +215,14 @@
Mode RequestedMode;
public:
REPLJobAction(Mode mode)
- : JobAction(Action::REPLJob, llvm::None, file_types::TY_Nothing),
+ : JobAction(Action::Kind::REPLJob, llvm::None,
+ file_types::TY_Nothing),
RequestedMode(mode) {}
Mode getRequestedMode() const { return RequestedMode; }
static bool classof(const Action *A) {
- return A->getKind() == Action::REPLJob;
+ return A->getKind() == Action::Kind::REPLJob;
}
};
@@ -225,11 +230,11 @@
virtual void anchor();
public:
MergeModuleJobAction(ArrayRef<const Action *> Inputs)
- : JobAction(Action::MergeModuleJob, Inputs,
+ : JobAction(Action::Kind::MergeModuleJob, Inputs,
file_types::TY_SwiftModuleFile) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::MergeModuleJob;
+ return A->getKind() == Action::Kind::MergeModuleJob;
}
};
@@ -237,10 +242,11 @@
virtual void anchor();
public:
ModuleWrapJobAction(ArrayRef<const Action *> Inputs)
- : JobAction(Action::ModuleWrapJob, Inputs, file_types::TY_Object) {}
+ : JobAction(Action::Kind::ModuleWrapJob, Inputs,
+ file_types::TY_Object) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::ModuleWrapJob;
+ return A->getKind() == Action::Kind::ModuleWrapJob;
}
};
@@ -248,11 +254,11 @@
virtual void anchor();
public:
AutolinkExtractJobAction(ArrayRef<const Action *> Inputs)
- : JobAction(Action::AutolinkExtractJob, Inputs,
+ : JobAction(Action::Kind::AutolinkExtractJob, Inputs,
file_types::TY_AutolinkFile) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::AutolinkExtractJob;
+ return A->getKind() == Action::Kind::AutolinkExtractJob;
}
};
@@ -260,10 +266,11 @@
virtual void anchor();
public:
explicit GenerateDSYMJobAction(const Action *Input)
- : JobAction(Action::GenerateDSYMJob, Input, file_types::TY_dSYM) {}
+ : JobAction(Action::Kind::GenerateDSYMJob, Input,
+ file_types::TY_dSYM) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::GenerateDSYMJob;
+ return A->getKind() == Action::Kind::GenerateDSYMJob;
}
};
@@ -271,10 +278,11 @@
virtual void anchor();
public:
explicit VerifyDebugInfoJobAction(const Action *Input)
- : JobAction(Action::VerifyDebugInfoJob, Input, file_types::TY_Nothing) {}
+ : JobAction(Action::Kind::VerifyDebugInfoJob, Input,
+ file_types::TY_Nothing) {}
static bool classof(const Action *A) {
- return A->getKind() == Action::VerifyDebugInfoJob;
+ return A->getKind() == Action::Kind::VerifyDebugInfoJob;
}
};
@@ -284,7 +292,7 @@
virtual void anchor();
public:
GeneratePCHJobAction(const Action *Input, StringRef persistentPCHDir)
- : JobAction(Action::GeneratePCHJob, Input,
+ : JobAction(Action::Kind::GeneratePCHJob, Input,
persistentPCHDir.empty() ? file_types::TY_PCH
: file_types::TY_Nothing),
PersistentPCHDir(persistentPCHDir) {}
@@ -293,7 +301,7 @@
StringRef getPersistentPCHDir() const { return PersistentPCHDir; }
static bool classof(const Action *A) {
- return A->getKind() == Action::GeneratePCHJob;
+ return A->getKind() == Action::Kind::GeneratePCHJob;
}
};
@@ -303,14 +311,15 @@
public:
LinkJobAction(ArrayRef<const Action *> Inputs, LinkKind K)
- : JobAction(Action::LinkJob, Inputs, file_types::TY_Image), Kind(K) {
+ : JobAction(Action::Kind::LinkJob, Inputs, file_types::TY_Image),
+ Kind(K) {
assert(Kind != LinkKind::None);
}
LinkKind getKind() const { return Kind; }
static bool classof(const Action *A) {
- return A->getKind() == Action::LinkJob;
+ return A->getKind() == Action::Kind::LinkJob;
}
};
diff --git a/include/swift/Frontend/OutputFileMap.h b/include/swift/Frontend/OutputFileMap.h
index 96fe785..775606a 100644
--- a/include/swift/Frontend/OutputFileMap.h
+++ b/include/swift/Frontend/OutputFileMap.h
@@ -28,7 +28,7 @@
namespace swift {
-typedef llvm::DenseMap<file_types::ID, std::string> TypeToPathMap;
+using TypeToPathMap = llvm::DenseMap<file_types::ID, std::string>;
class OutputFileMap {
private:
diff --git a/include/swift/IDE/ModuleInterfacePrinting.h b/include/swift/IDE/ModuleInterfacePrinting.h
index aa17b2a..e7d8042 100644
--- a/include/swift/IDE/ModuleInterfacePrinting.h
+++ b/include/swift/IDE/ModuleInterfacePrinting.h
@@ -40,7 +40,7 @@
};
/// Options used to describe the traversal of a module for printing.
-typedef OptionSet<ModuleTraversal> ModuleTraversalOptions;
+using ModuleTraversalOptions = OptionSet<ModuleTraversal>;
ArrayRef<StringRef> collectModuleGroups(ModuleDecl *M,
std::vector<StringRef> &Scratch);
@@ -82,4 +82,3 @@
} // namespace swift
#endif // SWIFT_IDE_MODULE_INTERFACE_PRINTING_H
-
diff --git a/include/swift/Runtime/Config.h b/include/swift/Runtime/Config.h
index 0c4eff1..2113157 100644
--- a/include/swift/Runtime/Config.h
+++ b/include/swift/Runtime/Config.h
@@ -54,7 +54,7 @@
/// above, information other than the class pointer could be contained in the
/// ISA.
#ifndef SWIFT_HAS_OPAQUE_ISAS
-#if __ARM_ARCH_7K__ >= 2
+#if defined(__arm__) && __ARM_ARCH_7K__ >= 2
#define SWIFT_HAS_OPAQUE_ISAS 1
#else
#define SWIFT_HAS_OPAQUE_ISAS 0
@@ -68,7 +68,7 @@
/// Which bits in the class metadata are used to distinguish Swift classes
/// from ObjC classes?
#ifndef SWIFT_CLASS_IS_SWIFT_MASK
-# if __APPLE__ && SWIFT_OBJC_INTEROP && SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
+# if defined(__APPLE__) && SWIFT_OBJC_INTEROP && SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
# define SWIFT_CLASS_IS_SWIFT_MASK 2ULL
# else
# define SWIFT_CLASS_IS_SWIFT_MASK 1ULL
diff --git a/include/swift/Runtime/Metadata.h b/include/swift/Runtime/Metadata.h
index a3bdad4..00633a1 100644
--- a/include/swift/Runtime/Metadata.h
+++ b/include/swift/Runtime/Metadata.h
@@ -1896,11 +1896,27 @@
};
using LiteralProtocolDescriptorList = TargetProtocolDescriptorList<InProcess>;
+/// A protocol requirement descriptor. This describes a single protocol
+/// requirement in a protocol descriptor. The index of the requirement in
+/// the descriptor determines the offset of the witness in a witness table
+/// for this protocol.
template <typename Runtime>
struct TargetProtocolRequirement {
ProtocolRequirementFlags Flags;
// TODO: name, type
+ /// A function pointer to a global symbol which is used by client code
+ /// to invoke the protocol requirement from a witness table. This pointer
+ /// is also to uniquely identify the requirement in resilient witness
+ /// tables, which is why it appears here.
+ ///
+ /// This forms the basis of our mechanism to hide witness table offsets
+ /// from clients, both when calling protocol requirements and when
+ /// defining witness tables.
+ ///
+ /// Will be null if the protocol is not resilient.
+ RelativeDirectPointer<void, /*nullable*/ true> Function;
+
/// The optional default implementation of the protocol.
RelativeDirectPointer<void, /*nullable*/ true> DefaultImplementation;
};
@@ -4075,10 +4091,11 @@
/// Initialize the field offset vector for a dependent-layout class, using the
/// "Universal" layout strategy.
SWIFT_RUNTIME_EXPORT
-void swift_initClassMetadata_UniversalStrategy(ClassMetadata *self,
- size_t numFields,
- const TypeLayout * const *fieldTypes,
- size_t *fieldOffsets);
+void swift_initClassMetadata(ClassMetadata *self,
+ ClassLayoutFlags flags,
+ size_t numFields,
+ const TypeLayout * const *fieldTypes,
+ size_t *fieldOffsets);
/// \brief Fetch a uniqued metadata for a metatype type.
SWIFT_RUNTIME_EXPORT
diff --git a/include/swift/Runtime/RuntimeFunctions.def b/include/swift/Runtime/RuntimeFunctions.def
index cbabad5..6643511 100644
--- a/include/swift/Runtime/RuntimeFunctions.def
+++ b/include/swift/Runtime/RuntimeFunctions.def
@@ -914,14 +914,15 @@
ATTRS(NoUnwind))
// struct FieldInfo { size_t Size; size_t AlignMask; };
-// void swift_initClassMetadata_UniversalStrategy(Metadata *self,
-// size_t numFields,
-// TypeLayout * const *fieldTypes,
-// size_t *fieldOffsets);
-FUNCTION(InitClassMetadataUniversal,
- swift_initClassMetadata_UniversalStrategy, C_CC,
+// void swift_initClassMetadata(Metadata *self,
+// ClassLayoutFlags flags,
+// size_t numFields,
+// TypeLayout * const *fieldTypes,
+// size_t *fieldOffsets);
+FUNCTION(InitClassMetadata,
+ swift_initClassMetadata, C_CC,
RETURNS(VoidTy),
- ARGS(TypeMetadataPtrTy, SizeTy,
+ ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
Int8PtrPtrTy->getPointerTo(),
SizeTy->getPointerTo()),
ATTRS(NoUnwind))
@@ -934,7 +935,8 @@
FUNCTION(InitStructMetadata,
swift_initStructMetadata, C_CC,
RETURNS(VoidTy),
- ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, Int8PtrPtrTy->getPointerTo(0),
+ ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
+ Int8PtrPtrTy->getPointerTo(0),
SizeTy->getPointerTo()),
ATTRS(NoUnwind))
diff --git a/include/swift/SIL/SILGlobalVariable.h b/include/swift/SIL/SILGlobalVariable.h
index 7fe6ba5..de41c52 100644
--- a/include/swift/SIL/SILGlobalVariable.h
+++ b/include/swift/SIL/SILGlobalVariable.h
@@ -206,7 +206,7 @@
} // end swift namespace
//===----------------------------------------------------------------------===//
-// ilist_traits for SILGLobalVariable
+// ilist_traits for SILGlobalVariable
//===----------------------------------------------------------------------===//
namespace llvm {
diff --git a/include/swift/SIL/SILWitnessTable.h b/include/swift/SIL/SILWitnessTable.h
index 2144263..48f32bd 100644
--- a/include/swift/SIL/SILWitnessTable.h
+++ b/include/swift/SIL/SILWitnessTable.h
@@ -84,20 +84,13 @@
ProtocolConformance *Witness;
};
- /// A witness table entry for an optional requirement that is not present.
- struct MissingOptionalWitness {
- /// The witness for the optional requirement that wasn't present.
- ValueDecl *Witness;
- };
-
/// A witness table entry kind.
enum WitnessKind {
Invalid,
Method,
AssociatedType,
AssociatedTypeProtocol,
- BaseProtocol,
- MissingOptional
+ BaseProtocol
};
/// A witness table entry.
@@ -108,7 +101,6 @@
AssociatedTypeWitness AssociatedType;
AssociatedTypeProtocolWitness AssociatedTypeProtocol;
BaseProtocolWitness BaseProtocol;
- MissingOptionalWitness MissingOptional;
};
public:
@@ -132,10 +124,6 @@
BaseProtocol(BaseProtocol)
{}
- Entry(const MissingOptionalWitness &MissingOptional)
- : Kind(WitnessKind::MissingOptional), MissingOptional(MissingOptional) {
- }
-
WitnessKind getKind() const { return Kind; }
const MethodWitness &getMethodWitness() const {
@@ -156,11 +144,6 @@
return BaseProtocol;
}
- const MissingOptionalWitness &getMissingOptionalWitness() const {
- assert(Kind == WitnessKind::MissingOptional);
- return MissingOptional;
- }
-
void removeWitnessMethod() {
assert(Kind == WitnessKind::Method);
if (Method.Witness) {
diff --git a/include/swift/Serialization/DeclTypeRecordNodes.def b/include/swift/Serialization/DeclTypeRecordNodes.def
index 1aee751..a60fb20 100644
--- a/include/swift/Serialization/DeclTypeRecordNodes.def
+++ b/include/swift/Serialization/DeclTypeRecordNodes.def
@@ -78,7 +78,7 @@
// These IDs must \em not be renumbered or reordered without incrementing
// VERSION_MAJOR in ModuleFormat.h. Names, however, may change.
-FIRST_TYPE(NAME_ALIAS, 1)
+FIRST_TYPE(BUILTIN_ALIAS, 1)
TYPE(GENERIC_TYPE_PARAM)
TYPE(DEPENDENT_MEMBER)
TYPE(NOMINAL)
@@ -106,7 +106,7 @@
TYPE(EXISTENTIAL_METATYPE)
TYPE(SIL_BLOCK_STORAGE)
TYPE(SIL_BOX)
-TYPE(BOUND_NAME_ALIAS)
+TYPE(NAME_ALIAS)
FIRST_DECL(TYPE_ALIAS, 60)
DECL(GENERIC_TYPE_PARAM)
diff --git a/include/swift/Serialization/ModuleFormat.h b/include/swift/Serialization/ModuleFormat.h
index b82c013..84beb4f 100644
--- a/include/swift/Serialization/ModuleFormat.h
+++ b/include/swift/Serialization/ModuleFormat.h
@@ -641,14 +641,14 @@
#include "swift/Serialization/DeclTypeRecordNodes.def"
};
- using NameAliasTypeLayout = BCRecordLayout<
- NAME_ALIAS_TYPE,
+ using BuiltinAliasTypeLayout = BCRecordLayout<
+ BUILTIN_ALIAS_TYPE,
DeclIDField, // typealias decl
TypeIDField // canonical type (a fallback)
>;
- using BoundNameAliasTypeLayout = BCRecordLayout<
- BOUND_NAME_ALIAS_TYPE,
+ using NameAliasTypeLayout = BCRecordLayout<
+ NAME_ALIAS_TYPE,
DeclIDField, // typealias decl
TypeIDField, // parent type
TypeIDField // underlying type
diff --git a/include/swift/Strings.h b/include/swift/Strings.h
index 7a501d5..f471278 100644
--- a/include/swift/Strings.h
+++ b/include/swift/Strings.h
@@ -35,6 +35,8 @@
static const char SWIFT_ONONE_SUPPORT[] = "SwiftOnoneSupport";
/// The name of the SwiftShims module, which contains private stdlib decls.
static const char SWIFT_SHIMS_NAME[] = "SwiftShims";
+ /// The name of the Builtin module, which contains Builtin functions.
+ static const char BUILTIN_NAME[] = "Builtin";
/// The prefix of module names used by LLDB to capture Swift expressions
static const char LLDB_EXPRESSIONS_MODULE_NAME_PREFIX[] = "__lldb_expr_";
@@ -42,6 +44,43 @@
static const char MANGLING_MODULE_OBJC[] = "__C";
/// The name of the fake module used to hold synthesized ClangImporter things.
static const char MANGLING_MODULE_CLANG_IMPORTER[] = "__C_Synthesized";
+
+ /// The name of the Builtin type prefix
+ static const char BUILTIN_TYPE_NAME_PREFIX[] = "Builtin.";
+ /// The name of the Builtin type for Int
+ static const char BUILTIN_TYPE_NAME_INT[] = "Builtin.Int";
+ /// The name of the Builtin type for Int8
+ static const char BUILTIN_TYPE_NAME_INT8[] = "Builtin.Int8";
+ /// The name of the Builtin type for Int16
+ static const char BUILTIN_TYPE_NAME_INT16[] = "Builtin.Int16";
+ /// The name of the Builtin type for Int32
+ static const char BUILTIN_TYPE_NAME_INT32[] = "Builtin.Int32";
+ /// The name of the Builtin type for Int64
+ static const char BUILTIN_TYPE_NAME_INT64[] = "Builtin.Int64";
+ /// The name of the Builtin type for Int128
+ static const char BUILTIN_TYPE_NAME_INT128[] = "Builtin.Int128";
+ /// The name of the Builtin type for Int256
+ static const char BUILTIN_TYPE_NAME_INT256[] = "Builtin.Int256";
+ /// The name of the Builtin type for Int512
+ static const char BUILTIN_TYPE_NAME_INT512[] = "Builtin.Int512";
+ /// The name of the Builtin type for Float
+ static const char BUILTIN_TYPE_NAME_FLOAT[] = "Builtin.Float";
+ /// The name of the Builtin type for NativeObject
+ static const char BUILTIN_TYPE_NAME_NATIVEOBJECT[] = "Builtin.NativeObject";
+ /// The name of the Builtin type for BridgeObject
+ static const char BUILTIN_TYPE_NAME_BRIDGEOBJECT[] = "Builtin.BridgeObject";
+ /// The name of the Builtin type for RawPointer
+ static const char BUILTIN_TYPE_NAME_RAWPOINTER[] = "Builtin.RawPointer";
+ /// The name of the Builtin type for UnsafeValueBuffer
+ static const char BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER[] = "Builtin.UnsafeValueBuffer";
+ /// The name of the Builtin type for UnknownObject
+ static const char BUILTIN_TYPE_NAME_UNKNOWNOBJECT[] = "Builtin.UnknownObject";
+ /// The name of the Builtin type for Vector
+ static const char BUILTIN_TYPE_NAME_VEC[] = "Builtin.Vec";
+ /// The name of the Builtin type for SILToken
+ static const char BUILTIN_TYPE_NAME_SILTOKEN[] = "Builtin.SILToken";
+ /// The name of the Builtin type for Word
+ static const char BUILTIN_TYPE_NAME_WORD[] = "Builtin.Word";
} // end namespace swift
#endif // SWIFT_STRINGS_H
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 14f5bd1..76f7f0f 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -278,7 +278,7 @@
/// arenas.
struct Arena {
llvm::DenseMap<Type, ErrorType *> ErrorTypesWithOriginal;
- llvm::FoldingSet<BoundNameAliasType> BoundNameAliasTypes;
+ llvm::FoldingSet<NameAliasType> NameAliasTypes;
llvm::FoldingSet<TupleType> TupleTypes;
llvm::DenseMap<std::pair<Type,char>, MetatypeType*> MetatypeTypes;
llvm::DenseMap<std::pair<Type,char>,
@@ -426,7 +426,7 @@
}
static ModuleDecl *createBuiltinModule(ASTContext &ctx) {
- auto M = ModuleDecl::create(ctx.getIdentifier("Builtin"), ctx);
+ auto M = ModuleDecl::create(ctx.getIdentifier(BUILTIN_NAME), ctx);
M->addFile(*new (ctx) BuiltinUnit(*M));
return M;
}
@@ -2887,46 +2887,55 @@
// Type manipulation routines.
//===----------------------------------------------------------------------===//
-BoundNameAliasType::BoundNameAliasType(TypeAliasDecl *typealias, Type parent,
+NameAliasType::NameAliasType(TypeAliasDecl *typealias, Type parent,
const SubstitutionMap &substitutions,
Type underlying,
RecursiveTypeProperties properties)
- : SugarType(TypeKind::BoundNameAlias, underlying, properties),
+ : SugarType(TypeKind::NameAlias, underlying, properties),
typealias(typealias) {
// Record the parent (or absence of a parent).
if (parent) {
- Bits.BoundNameAliasType.HasParent = true;
+ Bits.NameAliasType.HasParent = true;
*getTrailingObjects<Type>() = parent;
} else {
- Bits.BoundNameAliasType.HasParent = false;
+ Bits.NameAliasType.HasParent = false;
}
// Record the substitutions.
- if (auto genericSig = typealias->getGenericSignature()) {
+ if (auto genericSig = substitutions.getGenericSignature()) {
SmallVector<Substitution, 4> flatSubs;
genericSig->getSubstitutions(substitutions, flatSubs);
- Bits.BoundNameAliasType.NumSubstitutions = flatSubs.size();
+ Bits.NameAliasType.NumSubstitutions = flatSubs.size();
std::copy(flatSubs.begin(), flatSubs.end(),
getTrailingObjects<Substitution>());
+
+ *getTrailingObjects<GenericSignature *>() = genericSig;
} else {
- Bits.BoundNameAliasType.NumSubstitutions = 0;
+ Bits.NameAliasType.NumSubstitutions = 0;
}
}
-BoundNameAliasType *BoundNameAliasType::get(
+NameAliasType *NameAliasType::get(
TypeAliasDecl *typealias,
Type parent,
const SubstitutionMap &substitutions,
Type underlying) {
// Compute the recursive properties.
+ //
auto properties = underlying->getRecursiveProperties();
- if (parent)
+ auto storedProperties = properties;
+ if (parent) {
properties |= parent->getRecursiveProperties();
- auto genericSig = typealias->getGenericSignature();
+ if (parent->hasTypeVariable())
+ storedProperties |= RecursiveTypeProperties::HasTypeVariable;
+ }
+ auto genericSig = substitutions.getGenericSignature();
if (genericSig) {
for (Type gp : genericSig->getGenericParams()) {
- properties |= gp.subst(substitutions, SubstFlags::UseErrorType)
- ->getRecursiveProperties();
+ auto substGP = gp.subst(substitutions, SubstFlags::UseErrorType);
+ properties |= substGP->getRecursiveProperties();
+ if (substGP->hasTypeVariable())
+ storedProperties |= RecursiveTypeProperties::HasTypeVariable;
}
}
@@ -2936,37 +2945,43 @@
// Profile the type.
llvm::FoldingSetNodeID id;
- BoundNameAliasType::Profile(id, typealias, parent, substitutions);
+ NameAliasType::Profile(id, typealias, parent, substitutions,
+ underlying);
// Did we already record this type?
void *insertPos;
- auto &types = ctx.Impl.getArena(arena).BoundNameAliasTypes;
+ auto &types = ctx.Impl.getArena(arena).NameAliasTypes;
if (auto result = types.FindNodeOrInsertPos(id, insertPos))
return result;
// Build a new type.
unsigned numSubstitutions =
genericSig ? genericSig->getSubstitutionListSize() : 0;
+ assert(static_cast<bool>(genericSig) == numSubstitutions > 0);
auto size =
- totalSizeToAlloc<Type, Substitution>(parent ? 1 : 0, numSubstitutions);
- auto mem = ctx.Allocate(size, alignof(BoundNameAliasType), arena);
- auto result = new (mem) BoundNameAliasType(typealias, parent, substitutions,
- underlying, properties);
+ totalSizeToAlloc<Type, GenericSignature *, Substitution>(
+ parent ? 1 : 0, genericSig ? 1 : 0, numSubstitutions);
+ auto mem = ctx.Allocate(size, alignof(NameAliasType), arena);
+ auto result = new (mem) NameAliasType(typealias, parent, substitutions,
+ underlying, storedProperties);
types.InsertNode(result, insertPos);
return result;
}
-void BoundNameAliasType::Profile(llvm::FoldingSetNodeID &id) const {
- Profile(id, getDecl(), getParent(), getSubstitutionMap());
+void NameAliasType::Profile(llvm::FoldingSetNodeID &id) const {
+ Profile(id, getDecl(), getParent(), getSubstitutionMap(),
+ Type(getSinglyDesugaredType()));
}
-void BoundNameAliasType::Profile(
+void NameAliasType::Profile(
llvm::FoldingSetNodeID &id,
TypeAliasDecl *typealias,
- Type parent, const SubstitutionMap &substitutions) {
+ Type parent, const SubstitutionMap &substitutions,
+ Type underlying) {
id.AddPointer(typealias);
id.AddPointer(parent.getPointer());
substitutions.profile(id);
+ id.AddPointer(underlying.getPointer());
}
// Simple accessors.
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
index db1b031..04aeacc 100644
--- a/lib/AST/ASTDumper.cpp
+++ b/lib/AST/ASTDumper.cpp
@@ -3032,12 +3032,6 @@
void visitNameAliasType(NameAliasType *T, StringRef label) {
printCommon(label, "name_alias_type");
printField("decl", T->getDecl()->printRef());
- OS << ")";
- }
-
- void visitBoundNameAliasType(BoundNameAliasType *T, StringRef label) {
- printCommon(label, "bound_name_alias_type");
- printField("decl", T->getDecl()->printRef());
if (T->getParent())
printRec("parent", T->getParent());
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
index 655f831..94c963b 100644
--- a/lib/AST/ASTMangler.cpp
+++ b/lib/AST/ASTMangler.cpp
@@ -735,24 +735,20 @@
cast<BuiltinVectorType>(tybase)->getNumElements());
case TypeKind::NameAlias: {
assert(DWARFMangling && "sugared types are only legal for the debugger");
- auto NameAliasTy = cast<NameAliasType>(tybase);
- TypeAliasDecl *decl = NameAliasTy->getDecl();
+ auto aliasTy = cast<NameAliasType>(tybase);
+
+ // It's not possible to mangle the context of the builtin module.
+ // FIXME: We also cannot yet mangle references to typealiases that
+ // involve generics.
+ TypeAliasDecl *decl = aliasTy->getDecl();
if (decl->getModuleContext() == decl->getASTContext().TheBuiltinModule) {
- // It's not possible to mangle the context of the builtin module.
- return appendType(NameAliasTy->getSinglyDesugaredType());
+ return appendType(aliasTy->getSinglyDesugaredType());
}
// For the DWARF output we want to mangle the type alias + context,
// unless the type alias references a builtin type.
return appendAnyGenericType(decl);
}
- case TypeKind::BoundNameAlias: {
- assert(DWARFMangling && "sugared types are only legal for the debugger");
- auto boundAliasTy = cast<BoundNameAliasType>(tybase);
-
- // FIXME: Mangle as a generic type.
- return appendType(boundAliasTy->getSinglyDesugaredType());
- }
case TypeKind::Paren:
return appendSugaredType<ParenType>(type);
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
index 2768f45..c4af73e 100644
--- a/lib/AST/ASTPrinter.cpp
+++ b/lib/AST/ASTPrinter.cpp
@@ -3200,23 +3200,23 @@
}
void visitBuiltinRawPointerType(BuiltinRawPointerType *T) {
- Printer << "Builtin.RawPointer";
+ Printer << BUILTIN_TYPE_NAME_RAWPOINTER;
}
void visitBuiltinNativeObjectType(BuiltinNativeObjectType *T) {
- Printer << "Builtin.NativeObject";
+ Printer << BUILTIN_TYPE_NAME_NATIVEOBJECT;
}
void visitBuiltinUnknownObjectType(BuiltinUnknownObjectType *T) {
- Printer << "Builtin.UnknownObject";
+ Printer << BUILTIN_TYPE_NAME_UNKNOWNOBJECT;
}
void visitBuiltinBridgeObjectType(BuiltinBridgeObjectType *T) {
- Printer << "Builtin.BridgeObject";
+ Printer << BUILTIN_TYPE_NAME_BRIDGEOBJECT;
}
void visitBuiltinUnsafeValueBufferType(BuiltinUnsafeValueBufferType *T) {
- Printer << "Builtin.UnsafeValueBuffer";
+ Printer << BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER;
}
void visitBuiltinVectorType(BuiltinVectorType *T) {
@@ -3228,21 +3228,21 @@
llvm::raw_svector_ostream UnderlyingOS(UnderlyingStrVec);
T->getElementType().print(UnderlyingOS);
}
- if (UnderlyingStrVec.startswith("Builtin."))
+ if (UnderlyingStrVec.startswith(BUILTIN_TYPE_NAME_PREFIX))
UnderlyingStr = UnderlyingStrVec.substr(8);
else
UnderlyingStr = UnderlyingStrVec;
}
- Printer << "Builtin.Vec" << T->getNumElements() << "x" << UnderlyingStr;
+ Printer << BUILTIN_TYPE_NAME_VEC << T->getNumElements() << "x" << UnderlyingStr;
}
void visitBuiltinIntegerType(BuiltinIntegerType *T) {
auto width = T->getWidth();
if (width.isFixedWidth()) {
- Printer << "Builtin.Int" << width.getFixedWidth();
+ Printer << BUILTIN_TYPE_NAME_INT << width.getFixedWidth();
} else if (width.isPointerWidth()) {
- Printer << "Builtin.Word";
+ Printer << BUILTIN_TYPE_NAME_WORD;
} else {
llvm_unreachable("impossible bit width");
}
@@ -3260,7 +3260,7 @@
}
void visitSILTokenType(SILTokenType *T) {
- Printer << "Builtin.SILToken";
+ Printer << BUILTIN_TYPE_NAME_SILTOKEN;
}
void visitNameAliasType(NameAliasType *T) {
@@ -3269,26 +3269,6 @@
return;
}
- auto ParentDC = T->getDecl()->getDeclContext();
- auto ParentNominal = ParentDC ?
- ParentDC->getAsNominalTypeOrNominalTypeExtensionContext() : nullptr;
-
- if (ParentNominal) {
- visit(ParentNominal->getDeclaredType());
- Printer << ".";
- } else if (shouldPrintFullyQualified(T)) {
- printModuleContext(T);
- }
-
- printTypeDeclName(T);
- }
-
- void visitBoundNameAliasType(BoundNameAliasType *T) {
- if (Options.PrintForSIL || Options.PrintNameAliasUnderlyingType) {
- visit(T->getSinglyDesugaredType());
- return;
- }
-
if (auto parent = T->getParent()) {
visit(parent);
Printer << ".";
diff --git a/lib/AST/ASTVerifier.cpp b/lib/AST/ASTVerifier.cpp
index 51d19e2..08f3398 100644
--- a/lib/AST/ASTVerifier.cpp
+++ b/lib/AST/ASTVerifier.cpp
@@ -582,7 +582,8 @@
abort();
}
- bool foundError = type.findIf([&](Type type) -> bool {
+ bool foundError = false &&
+ type->getCanonicalType().findIf([&](Type type) -> bool {
if (auto archetype = type->getAs<ArchetypeType>()) {
// Only visit each archetype once.
if (!visitedArchetypes.insert(archetype).second)
@@ -2116,6 +2117,7 @@
// Make sure that there are no archetypes in the interface type.
if (VD->getDeclContext()->isTypeContext() &&
!hasEnclosingFunctionContext(VD->getDeclContext()) &&
+ VD->getInterfaceType()->hasArchetype() &&
VD->getInterfaceType().findIf([](Type type) {
return type->is<ArchetypeType>();
})) {
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index b3a0a43..d303471 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -2534,14 +2534,17 @@
// underlying type. See the comment in the ProtocolDecl case of
// validateDecl().
if (!hasInterfaceType()) {
- // Create a NameAliasType which will resolve to the underlying type.
- ASTContext &Ctx = getASTContext();
- auto aliasTy = new (Ctx, AllocationArena::Permanent) NameAliasType(this);
- aliasTy->setRecursiveProperties(getUnderlyingTypeLoc().getType()
- ->getRecursiveProperties());
-
// Set the interface type of this declaration.
- setInterfaceType(MetatypeType::get(aliasTy, Ctx));
+ ASTContext &ctx = getASTContext();
+
+ // If we can set a sugared type, do so.
+ if (!getGenericSignature()) {
+ auto sugaredType =
+ NameAliasType::get(this, Type(), SubstitutionMap(), underlying);
+ setInterfaceType(MetatypeType::get(sugaredType, ctx));
+ } else {
+ setInterfaceType(MetatypeType::get(underlying, ctx));
+ }
}
}
diff --git a/lib/AST/DeclContext.cpp b/lib/AST/DeclContext.cpp
index 9d3c017..0e6728f 100644
--- a/lib/AST/DeclContext.cpp
+++ b/lib/AST/DeclContext.cpp
@@ -47,15 +47,33 @@
GenericTypeDecl *
DeclContext::getAsTypeOrTypeExtensionContext() const {
- if (auto decl = const_cast<Decl*>(getAsDeclOrDeclExtensionContext())) {
- if (auto ED = dyn_cast<ExtensionDecl>(decl)) {
- if (auto type = ED->getExtendedType())
- return type->getAnyNominal();
- return nullptr;
+ auto decl = const_cast<Decl*>(getAsDeclOrDeclExtensionContext());
+ if (!decl) return nullptr;
+
+ auto ext = dyn_cast<ExtensionDecl>(decl);
+ if (!ext) return dyn_cast<GenericTypeDecl>(decl);
+
+ auto type = ext->getExtendedType();
+ if (!type) return nullptr;
+
+ while (true) {
+ // expected case: we reference a nominal type (potentially through sugar)
+ if (auto nominal = type->getAnyNominal())
+ return nominal;
+
+ // early type checking case: we have a typealias reference that is still
+ // unsugared, so explicitly look through the underlying type if there is
+ // one.
+ if (auto typealias =
+ dyn_cast_or_null<TypeAliasDecl>(type->getAnyGeneric())) {
+ type = typealias->getUnderlyingTypeLoc().getType();
+ if (!type) return nullptr;
+
+ continue;
}
- return dyn_cast<GenericTypeDecl>(decl);
+
+ return nullptr;
}
- return nullptr;
}
/// If this DeclContext is a NominalType declaration or an
diff --git a/lib/AST/DiagnosticConsumer.cpp b/lib/AST/DiagnosticConsumer.cpp
index 230dc55..3678e1a 100644
--- a/lib/AST/DiagnosticConsumer.cpp
+++ b/lib/AST/DiagnosticConsumer.cpp
@@ -19,6 +19,7 @@
#include "swift/AST/DiagnosticEngine.h"
#include "swift/Basic/Defer.h"
#include "swift/Basic/SourceManager.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/Debug.h"
@@ -116,6 +117,20 @@
// FileSpecificDiagnosticConsumer to be set up before the source files are
// actually loaded.
if (ConsumersOrderedByRange.empty()) {
+
+ // It's possible to get here while a bridging header PCH is being
+ // attached-to, if there's some sort of AST-reader warning or error, which
+ // happens before CompilerInstance::setUpInputs(), at which point _no_
+ // source buffers are loaded in yet. In that case we return nullptr, rather
+ // than trying to build a nonsensical map (and actually crashing since we
+ // can't find buffers for the inputs).
+ assert(!SubConsumers.empty());
+ if (!SM.getIDForBufferIdentifier(SubConsumers.begin()->first).hasValue()) {
+ assert(llvm::none_of(SubConsumers, [&](const ConsumerPair &pair) {
+ return SM.getIDForBufferIdentifier(pair.first).hasValue();
+ }));
+ return nullptr;
+ }
auto *mutableThis = const_cast<FileSpecificDiagnosticConsumer*>(this);
mutableThis->computeConsumersOrderedByRange(SM);
}
diff --git a/lib/AST/DiagnosticEngine.cpp b/lib/AST/DiagnosticEngine.cpp
index 65b33af..95cd868 100644
--- a/lib/AST/DiagnosticEngine.cpp
+++ b/lib/AST/DiagnosticEngine.cpp
@@ -327,30 +327,33 @@
}
static bool isInterestingTypealias(Type type) {
- // Bound name alias types are always interesting.
- if (isa<BoundNameAliasType>(type.getPointer())) return true;
-
- auto aliasTy = dyn_cast<NameAliasType>(type.getPointer());
- if (!aliasTy)
- return false;
- if (aliasTy->getDecl() == type->getASTContext().getVoidDecl())
- return false;
- if (type->is<BuiltinType>())
+ // Dig out the typealias declaration, if there is one.
+ TypeAliasDecl *aliasDecl = nullptr;
+ if (auto aliasTy = dyn_cast<NameAliasType>(type.getPointer()))
+ aliasDecl = aliasTy->getDecl();
+ else
return false;
- auto aliasDecl = aliasTy->getDecl();
+ if (aliasDecl == type->getASTContext().getVoidDecl())
+ return false;
// The 'Swift.AnyObject' typealias is not 'interesting'.
if (aliasDecl->getName() ==
- aliasDecl->getASTContext().getIdentifier("AnyObject") &&
- aliasDecl->getParentModule()->isStdlibModule()) {
+ aliasDecl->getASTContext().getIdentifier("AnyObject") &&
+ (aliasDecl->getParentModule()->isStdlibModule() ||
+ aliasDecl->getParentModule()->isBuiltinModule())) {
return false;
}
- auto underlyingTy = aliasDecl->getUnderlyingTypeLoc().getType();
-
- if (aliasDecl->isCompatibilityAlias())
+ // Compatibility aliases are only interesting insofar as their underlying
+ // types are interesting.
+ if (aliasDecl->isCompatibilityAlias()) {
+ auto underlyingTy = aliasDecl->getUnderlyingTypeLoc().getType();
return isInterestingTypealias(underlyingTy);
+ }
+
+ // Builtin types are never interesting typealiases.
+ if (type->is<BuiltinType>()) return false;
return true;
}
diff --git a/lib/AST/GenericEnvironment.cpp b/lib/AST/GenericEnvironment.cpp
index 3629b03..a40db12 100644
--- a/lib/AST/GenericEnvironment.cpp
+++ b/lib/AST/GenericEnvironment.cpp
@@ -230,3 +230,25 @@
genericSig->getSubstitutions(subMap, result);
return genericSig->getASTContext().AllocateCopy(result);
}
+
+std::pair<Type, ProtocolConformanceRef>
+GenericEnvironment::mapConformanceRefIntoContext(GenericEnvironment *genericEnv,
+ Type conformingType,
+ ProtocolConformanceRef conformance) {
+ if (!genericEnv)
+ return {conformingType, conformance};
+
+ return genericEnv->mapConformanceRefIntoContext(conformingType, conformance);
+}
+
+std::pair<Type, ProtocolConformanceRef>
+GenericEnvironment::mapConformanceRefIntoContext(
+ Type conformingInterfaceType,
+ ProtocolConformanceRef conformance) const {
+ auto contextConformance = conformance.subst(conformingInterfaceType,
+ QueryInterfaceTypeSubstitutions(this),
+ LookUpConformanceInSignature(*getGenericSignature()));
+
+ auto contextType = mapTypeIntoContext(conformingInterfaceType);
+ return {contextType, contextConformance};
+}
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
index c3745c0..f8d1c78 100644
--- a/lib/AST/GenericSignatureBuilder.cpp
+++ b/lib/AST/GenericSignatureBuilder.cpp
@@ -3899,24 +3899,34 @@
// The protocol concrete type has an underlying type written in terms
// of the protocol's 'Self' type.
- auto type = concreteDecl->getDeclaredInterfaceType();
+ auto typealias = dyn_cast<TypeAliasDecl>(concreteDecl);
+ auto type = typealias ? typealias->getUnderlyingTypeLoc().getType()
+ : concreteDecl->getDeclaredInterfaceType();
+ Type parentType;
+ SubstitutionMap subMap;
if (proto) {
// Substitute in the type of the current PotentialArchetype in
// place of 'Self' here.
- Type parentType = basePA->getDependentType(builder.getGenericParams());
+ parentType = basePA->getDependentType(builder.getGenericParams());
- auto subMap = SubstitutionMap::getProtocolSubstitutions(
+ subMap = SubstitutionMap::getProtocolSubstitutions(
proto, parentType, ProtocolConformanceRef(proto));
type = type.subst(subMap, SubstFlags::UseErrorType);
} else {
// Substitute in the superclass type.
- auto superclass = basePA->getEquivalenceClassIfPresent()->superclass;
- auto superclassDecl = superclass->getClassOrBoundGenericClass();
- type = superclass->getTypeOfMember(
- superclassDecl->getParentModule(), concreteDecl,
- concreteDecl->getDeclaredInterfaceType());
+ parentType = basePA->getEquivalenceClassIfPresent()->superclass;
+ auto superclassDecl = parentType->getClassOrBoundGenericClass();
+
+ subMap = parentType->getMemberSubstitutionMap(
+ superclassDecl->getParentModule(), concreteDecl);
+ type = type.subst(subMap, SubstFlags::UseErrorType);
+ }
+
+ // If we had a typealias, form a sugared type.
+ if (typealias) {
+ type = NameAliasType::get(typealias, parentType, subMap, type);
}
return type;
@@ -5431,13 +5441,13 @@
Action walkToTypePost(Type ty) override {
// Infer from generic typealiases.
- if (auto boundNameAlias = dyn_cast<BoundNameAliasType>(ty.getPointer())) {
- auto decl = boundNameAlias->getDecl();
+ if (auto NameAlias = dyn_cast<NameAliasType>(ty.getPointer())) {
+ auto decl = NameAlias->getDecl();
auto genericSig = decl->getGenericSignature();
if (!genericSig)
return Action::Continue;
- auto subMap = boundNameAlias->getSubstitutionMap();
+ auto subMap = NameAlias->getSubstitutionMap();
for (const auto &rawReq : genericSig->getRequirements()) {
if (auto req = rawReq.subst(subMap))
Builder.addRequirement(*req, source, nullptr);
diff --git a/lib/AST/SubstitutionMap.cpp b/lib/AST/SubstitutionMap.cpp
index a490fb6..59784ff 100644
--- a/lib/AST/SubstitutionMap.cpp
+++ b/lib/AST/SubstitutionMap.cpp
@@ -535,6 +535,9 @@
}
void SubstitutionMap::profile(llvm::FoldingSetNodeID &id) const {
+ // Generic signature.
+ id.AddPointer(genericSig);
+
if (empty() || !genericSig) return;
// Replacement types.
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 9b59b87..c49afce 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -1261,17 +1261,8 @@
#include "swift/AST/TypeNodes.def"
case TypeKind::Paren:
llvm_unreachable("parenthesis are sugar, but not syntax sugar");
- case TypeKind::BoundNameAlias:
+ case TypeKind::NameAlias:
llvm_unreachable("bound name alias types always have an underlying type");
- case TypeKind::NameAlias: {
- auto Ty = cast<NameAliasType>(this);
- auto UTy = Ty->getDecl()->getUnderlyingTypeLoc().getType().getPointer();
- if (isa<NominalOrBoundGenericNominalType>(UTy)) {
- Bits.SugarType.HasCachedType = true;
- UnderlyingType = UTy;
- }
- return UTy;
- }
case TypeKind::ArraySlice:
implDecl = Context->getArrayDecl();
break;
@@ -1298,14 +1289,14 @@
return UnderlyingType;
}
-SubstitutionMap BoundNameAliasType::getSubstitutionMap() const {
- if (auto genericSig = typealias->getGenericSignature())
+SubstitutionMap NameAliasType::getSubstitutionMap() const {
+ if (auto genericSig = getGenericSignature())
return genericSig->getSubstitutionMap(getSubstitutionList());
return SubstitutionMap();
}
-SmallVector<Type, 2> BoundNameAliasType::getInnermostGenericArgs() const {
+SmallVector<Type, 2> NameAliasType::getInnermostGenericArgs() const {
SmallVector<Type, 2> result;
// If the typealias is not generic, there are no generic arguments
@@ -1314,6 +1305,9 @@
auto genericSig = typealias->getGenericSignature();
if (!genericSig) return result;
+ // If the substitution list was empty, bail out.
+ if (getSubstitutionList().empty()) return result;
+
// Retrieve the substitutions for the generic parameters (only).
unsigned numAllGenericParams = genericSig->getGenericParams().size();
auto genericArgSubs = getSubstitutionList().slice(0, numAllGenericParams);
@@ -1466,26 +1460,14 @@
if (bound != Bindings.end()) {
return bound->second->isEqual(subst);
}
-
- auto canBindClassConstrainedArchetype = [](CanType t) -> bool {
- // Classes and class-constrained archetypes.
- if (t->mayHaveSuperclass())
- return true;
-
- // Pure @objc existentials.
- if (t->isObjCExistentialType())
- return true;
-
- return false;
- };
-
+
// Check that the archetype isn't constrained in a way that makes the
// binding impossible.
// For instance, if the archetype is class-constrained, and the binding
// is not a class, it can never be bound.
- if (orig->requiresClass() && !canBindClassConstrainedArchetype(subst))
+ if (orig->requiresClass() && !subst->satisfiesClassConstraint())
return false;
-
+
// TODO: If the archetype has a superclass constraint, check that the
// substitution is a subclass.
@@ -2849,10 +2831,13 @@
// This is a hacky feature allowing code completion to migrate to
// using Type::subst() without changing output.
- if (options & SubstFlags::DesugarMemberTypes)
- if (auto *aliasType = dyn_cast<NameAliasType>(witness.getPointer()))
+ if (options & SubstFlags::DesugarMemberTypes) {
+ if (auto *aliasType =
+ dyn_cast<NameAliasType>(witness.getPointer())) {
if (!aliasType->is<ErrorType>())
witness = aliasType->getSinglyDesugaredType();
+ }
+ }
if (witness->is<ErrorType>())
return failed();
@@ -3655,44 +3640,32 @@
case TypeKind::NameAlias: {
auto alias = cast<NameAliasType>(base);
- auto underlyingTy = Type(alias->getSinglyDesugaredType());
- if (!underlyingTy)
- return Type();
-
- auto transformedTy = underlyingTy.transformRec(fn);
- if (!transformedTy)
- return Type();
-
- if (transformedTy.getPointer() == underlyingTy.getPointer())
- return *this;
-
- return transformedTy;
- }
-
- case TypeKind::BoundNameAlias: {
- auto alias = cast<BoundNameAliasType>(base);
Type oldUnderlyingType = Type(alias->getSinglyDesugaredType());
Type newUnderlyingType = oldUnderlyingType.transformRec(fn);
if (!newUnderlyingType) return Type();
Type oldParentType = alias->getParent();
Type newParentType;
- if (oldParentType) {
+ if (oldParentType && !oldParentType->hasTypeParameter() &&
+ !oldParentType->hasArchetype()) {
newParentType = oldParentType.transformRec(fn);
- if (!newParentType) return Type();
+ if (!newParentType) return newUnderlyingType;
}
auto subMap = alias->getSubstitutionMap();
- auto genericSig = alias->getDecl()->getGenericSignature();
- if (genericSig) {
+ if (auto genericSig = subMap.getGenericSignature()) {
for (Type gp : genericSig->getGenericParams()) {
Type oldReplacementType = gp.subst(subMap);
if (!oldReplacementType)
return newUnderlyingType;
+ if (oldReplacementType->hasTypeParameter() ||
+ oldReplacementType->hasArchetype())
+ return newUnderlyingType;
+
Type newReplacementType = oldReplacementType.transformRec(fn);
if (!newReplacementType)
- return Type();
+ return newUnderlyingType;
// If anything changed with the replacement type, we lose the sugar.
// FIXME: This is really unfortunate.
@@ -3704,7 +3677,7 @@
if (oldUnderlyingType.getPointer() == newUnderlyingType.getPointer())
return *this;
- return BoundNameAliasType::get(alias->getDecl(), newParentType, subMap,
+ return NameAliasType::get(alias->getDecl(), newParentType, subMap,
newUnderlyingType);
}
@@ -3961,13 +3934,7 @@
// A 'public' typealias can have an 'internal' type.
if (auto *NAT = dyn_cast<NameAliasType>(Ty.getPointer())) {
auto *AliasDecl = NAT->getDecl();
- return AliasDecl->isPrivateStdlibDecl(treatNonBuiltinProtocolsAsPublic);
- }
-
- // A 'public' typealias can have an 'internal' type.
- if (auto *BNAT = dyn_cast<BoundNameAliasType>(Ty.getPointer())) {
- auto *AliasDecl = BNAT->getDecl();
- if (auto parent = BNAT->getParent()) {
+ if (auto parent = NAT->getParent()) {
if (parent.isPrivateStdlibType(treatNonBuiltinProtocolsAsPublic))
return true;
}
@@ -3975,7 +3942,7 @@
if (AliasDecl->isPrivateStdlibDecl(treatNonBuiltinProtocolsAsPublic))
return true;
- return Type(BNAT->getSinglyDesugaredType()).isPrivateStdlibType(
+ return Type(NAT->getSinglyDesugaredType()).isPrivateStdlibType(
treatNonBuiltinProtocolsAsPublic);
}
diff --git a/lib/AST/TypeWalker.cpp b/lib/AST/TypeWalker.cpp
index b636a08..a3c3a62 100644
--- a/lib/AST/TypeWalker.cpp
+++ b/lib/AST/TypeWalker.cpp
@@ -35,8 +35,7 @@
bool visitErrorType(ErrorType *ty) { return false; }
bool visitUnresolvedType(UnresolvedType *ty) { return false; }
bool visitBuiltinType(BuiltinType *ty) { return false; }
- bool visitNameAliasType(NameAliasType *ty) { return false; }
- bool visitBoundNameAliasType(BoundNameAliasType *ty) {
+ bool visitNameAliasType(NameAliasType *ty) {
if (auto parent = ty->getParent())
if (doIt(parent)) return true;
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp
index 3d9e6c4..f20b5ce 100644
--- a/lib/Basic/Version.cpp
+++ b/lib/Basic/Version.cpp
@@ -17,6 +17,7 @@
#include "clang/Basic/CharInfo.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringExtras.h"
#include "swift/AST/DiagnosticsParse.h"
#include "swift/Basic/LLVM.h"
#include "swift/Basic/Version.h"
@@ -303,6 +304,12 @@
return None;
case 1:
break;
+ case 2:
+ // The only valid explicit language version with a minor
+ // component is 4.2.
+ if (Components[0] == 4 && Components[1] == 2)
+ break;
+ return None;
default:
// We do not want to permit users requesting more precise effective language
// versions since accepting such an argument promises more than we're able
@@ -326,6 +333,9 @@
case 4:
static_assert(SWIFT_VERSION_MAJOR == 4,
"getCurrentLanguageVersion is no longer correct here");
+ // Version '4' on its own implies '4.1.50'.
+ if (size() == 1)
+ return Version{4, 1, 50};
return Version::getCurrentLanguageVersion();
case 5:
return Version{5, 0};
@@ -342,6 +352,16 @@
return res;
}
+std::string Version::asAPINotesVersionString() const {
+ // Other than for "4.2.x", map the Swift major version into
+ // the API notes version for Swift. This has the effect of allowing
+ // API notes to effect changes only on Swift major versions,
+ // not minor versions.
+ if (size() >= 2 && Components[0] == 4 && Components[1] == 2)
+ return "4.2";
+ return llvm::itostr(Components[0]);
+}
+
bool operator>=(const class Version &lhs,
const class Version &rhs) {
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
index ae49fb1..217d6f6 100644
--- a/lib/ClangImporter/ClangImporter.cpp
+++ b/lib/ClangImporter/ClangImporter.cpp
@@ -611,12 +611,8 @@
}
invocationArgStrs.push_back("-iapinotes-modules");
invocationArgStrs.push_back(searchPathOpts.RuntimeLibraryImportPath);
-
- // Map the Swift major version into the API notes version for Swift. This
- // has the effect of allowing API notes to effect changes only on Swift
- // major versions, not minor versions.
invocationArgStrs.push_back("-fapinotes-swift-version=" +
- llvm::itostr(languageVersion[0]));
+ languageVersion.asAPINotesVersionString());
}
static void
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
index 58c83c0..b76162e 100644
--- a/lib/ClangImporter/ImportDecl.cpp
+++ b/lib/ClangImporter/ImportDecl.cpp
@@ -2497,7 +2497,8 @@
// doing so will cause confusion (or even lookup ambiguity) between
// the name in the imported module and the same name in the
// standard library.
- if (auto *NAT = dyn_cast<NameAliasType>(SwiftType.getPointer()))
+ if (auto *NAT =
+ dyn_cast<NameAliasType>(SwiftType.getPointer()))
return NAT->getDecl();
auto *NTD = SwiftType->getAnyNominal();
@@ -2832,7 +2833,7 @@
AccessLevel::Public, loc, SourceLoc(),
C.Id_ErrorType, loc,
/*genericparams=*/nullptr, enumDecl);
- alias->setUnderlyingType(errorWrapper->getDeclaredInterfaceType());
+ alias->setUnderlyingType(Impl.getSugaredTypeReference(errorWrapper));
enumDecl->addMember(alias);
// Add the 'Code' enum to the error wrapper.
@@ -4967,7 +4968,7 @@
Impl.importSourceLoc(decl->getLocation()),
/*genericparams=*/nullptr, dc);
- typealias->setUnderlyingType(typeDecl->getDeclaredInterfaceType());
+ typealias->setUnderlyingType(Impl.getSugaredTypeReference(typeDecl));
return typealias;
}
@@ -5190,7 +5191,7 @@
if (underlyingAlias->isGeneric())
underlyingType = underlyingAlias->getUnboundGenericType();
else
- underlyingType = underlyingAlias->getDeclaredInterfaceType();
+ underlyingType = Impl.getSugaredTypeReference(underlyingAlias);
} else {
underlyingType = cast<NominalTypeDecl>(typeDecl)->getDeclaredType();
}
diff --git a/lib/ClangImporter/ImportName.cpp b/lib/ClangImporter/ImportName.cpp
index 211ca0d..8fcb6eb 100644
--- a/lib/ClangImporter/ImportName.cpp
+++ b/lib/ClangImporter/ImportName.cpp
@@ -578,6 +578,8 @@
if (!bestSoFar.empty() && bestSoFar <= info.Version)
return VersionedSwiftNameAction::Ignore;
+ auto requestedClangVersion = requestedVersion.asClangVersionTuple();
+
if (info.IsReplacedByActive) {
// We know that there are no versioned names between the active version and
// a replacement version, because otherwise /that/ name would be active.
@@ -586,7 +588,7 @@
// new value that is now active. (Special case: replacement = 0 means that
// a header annotation was replaced by an unversioned API notes annotation.)
if (info.Version.empty() ||
- info.Version.getMajor() >= requestedVersion.majorVersionNumber()) {
+ info.Version >= requestedClangVersion) {
return VersionedSwiftNameAction::ResetToActive;
}
if (bestSoFar.empty())
@@ -594,7 +596,7 @@
return VersionedSwiftNameAction::Ignore;
}
- if (info.Version.getMajor() < requestedVersion.majorVersionNumber())
+ if (info.Version < requestedClangVersion)
return VersionedSwiftNameAction::Ignore;
return VersionedSwiftNameAction::Use;
}
diff --git a/lib/ClangImporter/ImportName.h b/lib/ClangImporter/ImportName.h
index 83e302a..dc67c5c 100644
--- a/lib/ClangImporter/ImportName.h
+++ b/lib/ClangImporter/ImportName.h
@@ -56,12 +56,35 @@
public:
/// Map a language version into an import name version.
static ImportNameVersion fromOptions(const LangOptions &langOpts) {
- return ImportNameVersion(langOpts.EffectiveLanguageVersion[0]);
+ // We encode the 'rawValue' as just major version numbers with the
+ // exception of '4.2', which is a special minor version that can impact
+ // importing of names. We treat that with a rawValue of 5, and treat
+ // all major values of 5 or higher as being rawValue = majorversion + 1.
+ const auto &version = langOpts.EffectiveLanguageVersion;
+ if (version.size() > 1 && version[0] == 4 && version[1] == 2) {
+ return ImportNameVersion::swift4_2();
+ }
+ unsigned major = version[0];
+ return ImportNameVersion(major >= 5 ? major + 1 : major);
}
unsigned majorVersionNumber() const {
assert(*this != ImportNameVersion::raw());
- return rawValue;
+ if (*this == ImportNameVersion::swift4_2())
+ return 4;
+ return rawValue < 5 ? rawValue : rawValue - 1;
+ }
+
+ unsigned minorVersionNumber() const {
+ assert(*this != ImportNameVersion::raw());
+ if (*this == ImportNameVersion::swift4_2())
+ return 2;
+ return 0;
+ }
+
+ clang::VersionTuple asClangVersionTuple() const {
+ assert(*this != ImportNameVersion::raw());
+ return clang::VersionTuple(majorVersionNumber(), minorVersionNumber());
}
bool operator==(ImportNameVersion other) const {
@@ -105,12 +128,17 @@
return ImportNameVersion{2, AsConstExpr};
}
+ /// Names as they appeared in Swift 4.2 family.
+ static constexpr inline ImportNameVersion swift4_2() {
+ return ImportNameVersion{5, AsConstExpr};
+ }
+
/// The latest supported version.
///
/// FIXME: All other version information is in Version.h. Can this go there
/// instead?
static constexpr inline ImportNameVersion maxVersion() {
- return ImportNameVersion{5, AsConstExpr};
+ return ImportNameVersion{6, AsConstExpr};
}
/// The version which should be used for importing types, which need to have
diff --git a/lib/ClangImporter/ImportType.cpp b/lib/ClangImporter/ImportType.cpp
index a8776c4..b8f459f 100644
--- a/lib/ClangImporter/ImportType.cpp
+++ b/lib/ClangImporter/ImportType.cpp
@@ -748,7 +748,7 @@
if (!decl)
return nullptr;
- return decl->getDeclaredInterfaceType();
+ return getAdjustedTypeDeclReferenceType(decl);
}
/// Retrieve the 'Code' type for a bridged NSError, or nullptr if
@@ -776,15 +776,15 @@
}
/// Retrieve the adjusted type of a reference to the given type declaration.
- static Type getAdjustedTypeDeclReferenceType(TypeDecl *type) {
+ Type getAdjustedTypeDeclReferenceType(TypeDecl *type) {
// If the imported declaration is a bridged NSError, dig out
// the Code nested type. References to the enum type from C
// code need to map to the code type (which is ABI compatible with C),
// and the bridged error type is used elsewhere.
if (auto codeDecl = getBridgedNSErrorCode(type))
- return codeDecl->getDeclaredInterfaceType();
+ return Impl.getSugaredTypeReference(codeDecl);
- return type->getDeclaredInterfaceType();
+ return Impl.getSugaredTypeReference(type);
}
ImportResult VisitEnumType(const clang::EnumType *type) {
@@ -2466,6 +2466,25 @@
return Type();
}
+Type ClangImporter::Implementation::getSugaredTypeReference(TypeDecl *type) {
+ // For typealiases, build a sugared type.
+ if (auto typealias = dyn_cast<TypeAliasDecl>(type)) {
+ // If this typealias is nested, retrieve the parent type.
+ Type parentType;
+ if (auto nominal =
+ typealias->getDeclContext()
+ ->getAsNominalTypeOrNominalTypeExtensionContext()) {
+ if (!nominal->getGenericSignature())
+ parentType = nominal->getDeclaredInterfaceType();
+ }
+
+ return NameAliasType::get(typealias, parentType, SubstitutionMap(),
+ typealias->getUnderlyingTypeLoc().getType());
+ }
+
+ return type->getDeclaredInterfaceType();
+}
+
Type ClangImporter::Implementation::getNSCopyingType() {
return getNamedProtocolType(*this, "NSCopying");
}
diff --git a/lib/ClangImporter/ImporterImpl.h b/lib/ClangImporter/ImporterImpl.h
index 290ea3b..080f8f0 100644
--- a/lib/ClangImporter/ImporterImpl.h
+++ b/lib/ClangImporter/ImporterImpl.h
@@ -968,6 +968,9 @@
/// \brief Retrieve the NSCopying protocol type.
Type getNSCopyingType();
+ /// \brief Retrieve a sugared referenece to the given (imported) type.
+ Type getSugaredTypeReference(TypeDecl *type);
+
/// \brief Determines whether the given type matches an implicit type
/// bound of "Hashable", which is used to validate NSDictionary/NSSet.
bool matchesHashableBound(Type type);
diff --git a/lib/Demangling/Demangler.cpp b/lib/Demangling/Demangler.cpp
index f5fff72..7a3a3db 100644
--- a/lib/Demangling/Demangler.cpp
+++ b/lib/Demangling/Demangler.cpp
@@ -140,7 +140,10 @@
int swift::Demangle::getManglingPrefixLength(llvm::StringRef mangledName) {
if (mangledName.empty()) return 0;
- llvm::StringRef prefixes[] = {/*Swift 4*/ "_T0", /*Swift > 4*/ "$S", "_$S"};
+ llvm::StringRef prefixes[] = {
+ /*Swift 4*/ "_T0",
+ /*Swift 4.x*/ "$S", "_$S",
+ /*Swift 5+*/ "$s", "_$s"};
// Look for any of the known prefixes
for (auto prefix : prefixes) {
@@ -923,18 +926,18 @@
switch (nextChar()) {
case 'b':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.BridgeObject");
+ BUILTIN_TYPE_NAME_BRIDGEOBJECT);
break;
case 'B':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.UnsafeValueBuffer");
+ BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER);
break;
case 'f': {
int size = demangleIndex() - 1;
if (size <= 0)
return nullptr;
CharVector name;
- name.append("Builtin.Float", *this);
+ name.append(BUILTIN_TYPE_NAME_FLOAT, *this);
name.append(size, *this);
Ty = createNode(Node::Kind::BuiltinTypeName, name);
break;
@@ -944,7 +947,7 @@
if (size <= 0)
return nullptr;
CharVector name;
- name.append("Builtin.Int", *this);
+ name.append(BUILTIN_TYPE_NAME_INT, *this);
name.append(size, *this);
Ty = createNode(Node::Kind::BuiltinTypeName, name);
break;
@@ -955,34 +958,34 @@
return nullptr;
NodePointer EltType = popTypeAndGetChild();
if (!EltType || EltType->getKind() != Node::Kind::BuiltinTypeName ||
- !EltType->getText().startswith("Builtin."))
+ !EltType->getText().startswith(BUILTIN_TYPE_NAME_PREFIX))
return nullptr;
CharVector name;
- name.append("Builtin.Vec", *this);
+ name.append(BUILTIN_TYPE_NAME_VEC, *this);
name.append(elts, *this);
name.push_back('x', *this);
- name.append(EltType->getText().substr(sizeof("Builtin.") - 1), *this);
+ name.append(EltType->getText().substr(strlen(BUILTIN_TYPE_NAME_PREFIX)), *this);
Ty = createNode(Node::Kind::BuiltinTypeName, name);
break;
}
case 'O':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.UnknownObject");
+ BUILTIN_TYPE_NAME_UNKNOWNOBJECT);
break;
case 'o':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.NativeObject");
+ BUILTIN_TYPE_NAME_NATIVEOBJECT);
break;
case 'p':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.RawPointer");
+ BUILTIN_TYPE_NAME_RAWPOINTER);
break;
case 't':
- Ty = createNode(Node::Kind::BuiltinTypeName, "Builtin.SILToken");
+ Ty = createNode(Node::Kind::BuiltinTypeName, BUILTIN_TYPE_NAME_SILTOKEN);
break;
case 'w':
Ty = createNode(Node::Kind::BuiltinTypeName,
- "Builtin.Word");
+ BUILTIN_TYPE_NAME_WORD);
break;
default:
return nullptr;
diff --git a/lib/Demangling/Remangler.cpp b/lib/Demangling/Remangler.cpp
index 5a50dfa..04adffe 100644
--- a/lib/Demangling/Remangler.cpp
+++ b/lib/Demangling/Remangler.cpp
@@ -598,25 +598,25 @@
Buffer << 'B';
StringRef text = node->getText();
- if (text == "Builtin.BridgeObject") {
+ if (text == BUILTIN_TYPE_NAME_BRIDGEOBJECT) {
Buffer << 'b';
- } else if (text == "Builtin.UnsafeValueBuffer") {
+ } else if (text == BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER) {
Buffer << 'B';
- } else if (text == "Builtin.UnknownObject") {
+ } else if (text == BUILTIN_TYPE_NAME_UNKNOWNOBJECT) {
Buffer << 'O';
- } else if (text == "Builtin.NativeObject") {
+ } else if (text == BUILTIN_TYPE_NAME_NATIVEOBJECT) {
Buffer << 'o';
- } else if (text == "Builtin.RawPointer") {
+ } else if (text == BUILTIN_TYPE_NAME_RAWPOINTER) {
Buffer << 'p';
- } else if (text == "Builtin.SILToken") {
+ } else if (text == BUILTIN_TYPE_NAME_SILTOKEN) {
Buffer << 't';
- } else if (text == "Builtin.Word") {
+ } else if (text == BUILTIN_TYPE_NAME_WORD) {
Buffer << 'w';
- } else if (stripPrefix(text, "Builtin.Int")) {
+ } else if (stripPrefix(text, BUILTIN_TYPE_NAME_INT)) {
Buffer << 'i' << text << '_';
- } else if (stripPrefix(text, "Builtin.Float")) {
+ } else if (stripPrefix(text, BUILTIN_TYPE_NAME_FLOAT)) {
Buffer << 'f' << text << '_';
- } else if (stripPrefix(text, "Builtin.Vec")) {
+ } else if (stripPrefix(text, BUILTIN_TYPE_NAME_VEC)) {
auto split = text.split('x');
if (split.second == "RawPointer") {
Buffer << 'p';
diff --git a/lib/Driver/Action.cpp b/lib/Driver/Action.cpp
index 104b27b..95df884 100644
--- a/lib/Driver/Action.cpp
+++ b/lib/Driver/Action.cpp
@@ -18,20 +18,20 @@
using namespace swift::driver;
using namespace llvm::opt;
-const char *Action::getClassName(ActionClass AC) {
+const char *Action::getClassName(Kind AC) {
switch (AC) {
- case Input: return "input";
- case CompileJob: return "compile";
- case InterpretJob: return "interpret";
- case BackendJob: return "backend";
- case MergeModuleJob: return "merge-module";
- case ModuleWrapJob: return "modulewrap";
- case AutolinkExtractJob: return "swift-autolink-extract";
- case REPLJob: return "repl";
- case LinkJob: return "link";
- case GenerateDSYMJob: return "generate-dSYM";
- case VerifyDebugInfoJob: return "verify-debug-info";
- case GeneratePCHJob: return "generate-pch";
+ case Kind::Input: return "input";
+ case Kind::CompileJob: return "compile";
+ case Kind::InterpretJob: return "interpret";
+ case Kind::BackendJob: return "backend";
+ case Kind::MergeModuleJob: return "merge-module";
+ case Kind::ModuleWrapJob: return "modulewrap";
+ case Kind::AutolinkExtractJob: return "swift-autolink-extract";
+ case Kind::REPLJob: return "repl";
+ case Kind::LinkJob: return "link";
+ case Kind::GenerateDSYMJob: return "generate-dSYM";
+ case Kind::VerifyDebugInfoJob: return "verify-debug-info";
+ case Kind::GeneratePCHJob: return "generate-pch";
}
llvm_unreachable("invalid class");
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
index 9a2b684..7cbace5 100644
--- a/lib/Driver/ToolChain.cpp
+++ b/lib/Driver/ToolChain.cpp
@@ -74,8 +74,9 @@
auto invocationInfo = [&]() -> InvocationInfo {
switch (JA.getKind()) {
- #define CASE(K) case Action::K: \
- return constructInvocation(cast<K##Action>(JA), context);
+#define CASE(K) \
+ case Action::Kind::K: \
+ return constructInvocation(cast<K##Action>(JA), context);
CASE(CompileJob)
CASE(InterpretJob)
CASE(BackendJob)
@@ -88,7 +89,7 @@
CASE(AutolinkExtractJob)
CASE(REPLJob)
#undef CASE
- case Action::Input:
+ case Action::Kind::Input:
llvm_unreachable("not a JobAction");
}
diff --git a/lib/Frontend/ArgsToFrontendInputsConverter.cpp b/lib/Frontend/ArgsToFrontendInputsConverter.cpp
index 3fc47cb..87b4ae3 100644
--- a/lib/Frontend/ArgsToFrontendInputsConverter.cpp
+++ b/lib/Frontend/ArgsToFrontendInputsConverter.cpp
@@ -10,11 +10,11 @@
//
//===----------------------------------------------------------------------===//
-#include "swift/Frontend/ArgsToFrontendInputsConverter.h"
+#include "ArgsToFrontendInputsConverter.h"
+#include "ArgsToFrontendOutputsConverter.h"
#include "swift/AST/DiagnosticsFrontend.h"
#include "swift/Basic/Defer.h"
-#include "swift/Frontend/ArgsToFrontendOutputsConverter.h"
#include "swift/Frontend/FrontendOptions.h"
#include "swift/Option/Options.h"
#include "swift/Parse/Lexer.h"
diff --git a/include/swift/Frontend/ArgsToFrontendInputsConverter.h b/lib/Frontend/ArgsToFrontendInputsConverter.h
similarity index 100%
rename from include/swift/Frontend/ArgsToFrontendInputsConverter.h
rename to lib/Frontend/ArgsToFrontendInputsConverter.h
diff --git a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
index 07024f4..85552d0 100644
--- a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
+++ b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
@@ -10,12 +10,12 @@
//
//===----------------------------------------------------------------------===//
-#include "swift/Frontend/ArgsToFrontendOptionsConverter.h"
+#include "ArgsToFrontendOptionsConverter.h"
+#include "ArgsToFrontendInputsConverter.h"
+#include "ArgsToFrontendOutputsConverter.h"
#include "swift/AST/DiagnosticsFrontend.h"
#include "swift/Basic/Platform.h"
-#include "swift/Frontend/ArgsToFrontendInputsConverter.h"
-#include "swift/Frontend/ArgsToFrontendOutputsConverter.h"
#include "swift/Frontend/Frontend.h"
#include "swift/Option/Options.h"
#include "swift/Option/SanitizerOptions.h"
diff --git a/include/swift/Frontend/ArgsToFrontendOptionsConverter.h b/lib/Frontend/ArgsToFrontendOptionsConverter.h
similarity index 100%
rename from include/swift/Frontend/ArgsToFrontendOptionsConverter.h
rename to lib/Frontend/ArgsToFrontendOptionsConverter.h
diff --git a/lib/Frontend/ArgsToFrontendOutputsConverter.cpp b/lib/Frontend/ArgsToFrontendOutputsConverter.cpp
index 58473d2..d4bf41e 100644
--- a/lib/Frontend/ArgsToFrontendOutputsConverter.cpp
+++ b/lib/Frontend/ArgsToFrontendOutputsConverter.cpp
@@ -9,12 +9,12 @@
//
//===----------------------------------------------------------------------===//
-#include "swift/Frontend/ArgsToFrontendOutputsConverter.h"
+#include "ArgsToFrontendOutputsConverter.h"
+#include "ArgsToFrontendInputsConverter.h"
+#include "ArgsToFrontendOptionsConverter.h"
#include "swift/AST/DiagnosticsFrontend.h"
#include "swift/Basic/Platform.h"
-#include "swift/Frontend/ArgsToFrontendInputsConverter.h"
-#include "swift/Frontend/ArgsToFrontendOptionsConverter.h"
#include "swift/Frontend/Frontend.h"
#include "swift/Frontend/OutputFileMap.h"
#include "swift/Option/Options.h"
diff --git a/include/swift/Frontend/ArgsToFrontendOutputsConverter.h b/lib/Frontend/ArgsToFrontendOutputsConverter.h
similarity index 100%
rename from include/swift/Frontend/ArgsToFrontendOutputsConverter.h
rename to lib/Frontend/ArgsToFrontendOutputsConverter.h
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 79852a0..b53fe8a 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -12,9 +12,9 @@
#include "swift/Frontend/Frontend.h"
+#include "ArgsToFrontendOptionsConverter.h"
#include "swift/AST/DiagnosticsFrontend.h"
#include "swift/Basic/Platform.h"
-#include "swift/Frontend/ArgsToFrontendOptionsConverter.h"
#include "swift/Option/Options.h"
#include "swift/Option/SanitizerOptions.h"
#include "swift/Strings.h"
diff --git a/lib/Frontend/OutputFileMap.cpp b/lib/Frontend/OutputFileMap.cpp
index 02805e3..15117f1 100644
--- a/lib/Frontend/OutputFileMap.cpp
+++ b/lib/Frontend/OutputFileMap.cpp
@@ -65,7 +65,7 @@
}
void OutputFileMap::dump(llvm::raw_ostream &os, bool Sort) const {
- typedef std::pair<file_types::ID, std::string> TypePathPair;
+ using TypePathPair = std::pair<file_types::ID, std::string>;
auto printOutputPair = [&os](StringRef InputPath,
const TypePathPair &OutputPair) -> void {
@@ -74,7 +74,7 @@
};
if (Sort) {
- typedef std::pair<StringRef, TypeToPathMap> PathMapPair;
+ using PathMapPair = std::pair<StringRef, TypeToPathMap>;
std::vector<PathMapPair> Maps;
for (auto &InputPair : InputToOutputsMap) {
Maps.emplace_back(InputPair.first(), InputPair.second);
diff --git a/lib/Frontend/SerializedDiagnosticConsumer.cpp b/lib/Frontend/SerializedDiagnosticConsumer.cpp
index bd4dec1..ffd9024 100644
--- a/lib/Frontend/SerializedDiagnosticConsumer.cpp
+++ b/lib/Frontend/SerializedDiagnosticConsumer.cpp
@@ -83,8 +83,8 @@
}
};
-typedef SmallVector<uint64_t, 64> RecordData;
-typedef SmallVectorImpl<uint64_t> RecordDataImpl;
+using RecordData = SmallVector<uint64_t, 64>;
+using RecordDataImpl = SmallVectorImpl<uint64_t>;
struct SharedState : llvm::RefCountedBase<SharedState> {
SharedState(StringRef serializedDiagnosticsPath)
@@ -113,8 +113,8 @@
/// \brief The collection of files used.
llvm::DenseMap<const char *, unsigned> Files;
- typedef llvm::DenseMap<const void *, std::pair<unsigned, StringRef> >
- DiagFlagsTy;
+ using DiagFlagsTy =
+ llvm::DenseMap<const void *, std::pair<unsigned, StringRef>>;
/// \brief Map for uniquing strings.
DiagFlagsTy DiagFlags;
@@ -560,4 +560,3 @@
if (bracketDiagnostic)
exitDiagBlock();
}
-
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
index a8c089a..69ee1b3 100644
--- a/lib/IDE/CodeCompletion.cpp
+++ b/lib/IDE/CodeCompletion.cpp
@@ -50,7 +50,7 @@
using namespace swift;
using namespace ide;
-typedef std::vector<std::pair<StringRef, StringRef>> CommandWordsPairs;
+using CommandWordsPairs = std::vector<std::pair<StringRef, StringRef>>;
enum CodeCompletionCommandKind {
none,
@@ -309,7 +309,7 @@
return false;
}
-typedef std::function<bool(ValueDecl*, DeclVisibilityKind)> DeclFilter;
+using DeclFilter = std::function<bool(ValueDecl *, DeclVisibilityKind)>;
static bool DefaultFilter(ValueDecl* VD, DeclVisibilityKind Kind) {
return true;
}
@@ -2731,10 +2731,22 @@
Builder.addTextChunk(TAD->getName().str());
if (TAD->hasInterfaceType()) {
auto underlyingType = TAD->getUnderlyingTypeLoc().getType();
- if (underlyingType->hasError())
- addTypeAnnotation(Builder, TAD->getDeclaredInterfaceType());
- else
+ if (underlyingType->hasError()) {
+ Type parentType;
+ if (auto nominal =
+ TAD->getDeclContext()
+ ->getAsNominalTypeOrNominalTypeExtensionContext()) {
+ parentType = nominal->getDeclaredInterfaceType();
+ }
+ addTypeAnnotation(
+ Builder,
+ NameAliasType::get(const_cast<TypeAliasDecl *>(TAD),
+ parentType, SubstitutionMap(),
+ underlyingType));
+
+ } else {
addTypeAnnotation(Builder, underlyingType);
+ }
}
}
@@ -2927,9 +2939,9 @@
Optional<Type> Result = None;
if (auto AT = MT->getInstanceType()) {
if (!CD->getInterfaceType()->is<ErrorType>() &&
- isa<NameAliasType>(AT.getPointer()) &&
- AT->getDesugaredType() ==
- CD->getResultInterfaceType().getPointer())
+ (isa<NameAliasType>(AT.getPointer()) &&
+ AT->getDesugaredType() ==
+ CD->getResultInterfaceType().getPointer()))
Result = AT;
}
addConstructorCall(CD, Reason, None, Result);
diff --git a/lib/IDE/Formatting.cpp b/lib/IDE/Formatting.cpp
index 7ef1655..3b8f156 100644
--- a/lib/IDE/Formatting.cpp
+++ b/lib/IDE/Formatting.cpp
@@ -39,7 +39,7 @@
operator bool() { return StartOfLineTarget && StartOfLineBeforeTarget; }
};
-typedef llvm::SmallString<64> StringBuilder;
+using StringBuilder = llvm::SmallString<64>;
static SourceLoc getVarDeclInitEnd(VarDecl *VD) {
return VD->getBracesRange().isValid()
@@ -485,7 +485,7 @@
};
class FormatWalker : public SourceEntityWalker {
- typedef ArrayRef<Token>::iterator TokenIt;
+ using TokenIt = ArrayRef<Token>::iterator;
class SiblingCollector {
SourceLoc FoundSibling;
SourceManager &SM;
diff --git a/lib/IDE/IDETypeChecking.cpp b/lib/IDE/IDETypeChecking.cpp
index 98437fb..681b7c2 100644
--- a/lib/IDE/IDETypeChecking.cpp
+++ b/lib/IDE/IDETypeChecking.cpp
@@ -199,8 +199,10 @@
}
};
- typedef llvm::MapVector<ExtensionDecl*, SynthesizedExtensionInfo> ExtensionInfoMap;
- typedef llvm::MapVector<ExtensionDecl*, ExtensionMergeInfo> ExtensionMergeInfoMap;
+ using ExtensionInfoMap =
+ llvm::MapVector<ExtensionDecl *, SynthesizedExtensionInfo>;
+ using ExtensionMergeInfoMap =
+ llvm::MapVector<ExtensionDecl *, ExtensionMergeInfo>;
struct ExtensionMergeGroup {
@@ -240,7 +242,7 @@
}
};
- typedef std::vector<ExtensionMergeGroup> MergeGroupVector;
+ using MergeGroupVector = std::vector<ExtensionMergeGroup>;
NominalTypeDecl *Target;
Type BaseType;
diff --git a/lib/IDE/SyntaxModel.cpp b/lib/IDE/SyntaxModel.cpp
index 56623da..eee9ad9 100644
--- a/lib/IDE/SyntaxModel.cpp
+++ b/lib/IDE/SyntaxModel.cpp
@@ -205,7 +205,7 @@
namespace {
-typedef ASTWalker::ParentTy ASTNodeType;
+using ASTNodeType = ASTWalker::ParentTy;
struct StructureElement {
SyntaxStructureNode StructureNode;
@@ -286,7 +286,7 @@
bool handleAttrs(const DeclAttributes &Attrs);
bool handleAttrs(const TypeAttributes &Attrs);
- typedef std::pair<const DeclAttribute *, SourceRange> DeclAttributeAndRange;
+ using DeclAttributeAndRange = std::pair<const DeclAttribute *, SourceRange>;
bool handleSpecialDeclAttribute(const DeclAttribute *Decl,
ArrayRef<Token> Toks);
diff --git a/lib/IDE/TypeReconstruction.cpp b/lib/IDE/TypeReconstruction.cpp
index f522ab6..51189d0 100644
--- a/lib/IDE/TypeReconstruction.cpp
+++ b/lib/IDE/TypeReconstruction.cpp
@@ -29,7 +29,7 @@
using namespace swift;
// FIXME: replace with std::string and StringRef as appropriate to each case.
-typedef const std::string ConstString;
+using ConstString = const std::string;
static std::string stringWithFormat(const char *fmt_str, ...) {
int final_n, n = ((int)strlen(fmt_str)) * 2;
@@ -76,7 +76,7 @@
class DeclsLookupSource {
public:
- typedef SmallVectorImpl<ValueDecl *> ValueDecls;
+ using ValueDecls = SmallVectorImpl<ValueDecl *>;
private:
class VisibleDeclsConsumer : public VisibleDeclConsumer {
@@ -124,14 +124,14 @@
Invalid
};
- typedef Optional<std::string> PrivateDeclIdentifier;
+ using PrivateDeclIdentifier = Optional<std::string>;
static DeclsLookupSource
GetDeclsLookupSource(ASTContext &ast, ConstString module_name,
bool allow_clang_importer = true) {
assert(!module_name.empty());
static ConstString g_ObjectiveCModule(MANGLING_MODULE_OBJC);
- static ConstString g_BuiltinModule("Builtin");
+ static ConstString g_BuiltinModule(BUILTIN_NAME);
static ConstString g_CModule(MANGLING_MODULE_CLANG_IMPORTER);
if (allow_clang_importer) {
if (module_name == g_ObjectiveCModule || module_name == g_CModule)
@@ -799,13 +799,13 @@
StringRef builtin_name_ref(builtin_name);
- if (builtin_name_ref.startswith("Builtin.")) {
+ if (builtin_name_ref.startswith(BUILTIN_TYPE_NAME_PREFIX)) {
StringRef stripped_name_ref =
- builtin_name_ref.drop_front(strlen("Builtin."));
+ builtin_name_ref.drop_front(strlen(BUILTIN_TYPE_NAME_PREFIX));
SmallVector<ValueDecl *, 1> builtin_decls;
result._module =
- DeclsLookupSource::GetDeclsLookupSource(*ast, ConstString("Builtin"));
+ DeclsLookupSource::GetDeclsLookupSource(*ast, ConstString(BUILTIN_NAME));
if (!FindNamedDecls(ast, ast->getIdentifier(stripped_name_ref), result)) {
result.Clear();
@@ -814,7 +814,7 @@
}
} else {
result._error = stringWithFormat(
- "BuiltinTypeName %s doesn't start with Builtin.", builtin_name.c_str());
+ "BuiltinTypeName %s doesn't start with %s", builtin_name.c_str(), BUILTIN_TYPE_NAME_PREFIX);
}
}
@@ -1217,7 +1217,7 @@
name->getText());
}
-// VisitNodeFunction gets used for Function, Variable and Allocator:
+// VisitNodeFunction gets used for Function and Variable.
static void VisitNodeFunction(
ASTContext *ast,
Demangle::NodePointer cur_node, VisitNodeResult &result) {
@@ -1347,25 +1347,6 @@
}
} while (0);
- // if (node_kind == Demangle::Node::Kind::Allocator)
- // {
- // // For allocators we don't have an identifier for
- // the name, we will
- // // need to extract it from the class or struct in
- // "identifier_result"
- // //Find
- // if (identifier_result.HasSingleType())
- // {
- // // This contains the class or struct
- // StringRef init_name("init");
- //
- // if (FindFirstNamedDeclWithKind(ast, init_name,
- // DeclKind::Constructor, identifier_result))
- // {
- // }
- // }
- // }
-
if (identifier_result._types.size() == 1) {
result._module = identifier_result._module;
result._decls.push_back(identifier_result._decls[0]);
@@ -2175,6 +2156,26 @@
}
}
+static void VisitNodeGlobal(ASTContext *ast, Demangle::NodePointer cur_node,
+ VisitNodeResult &result) {
+ assert(result._error.empty());
+
+ Demangle::Node::iterator child_end = cur_node->end();
+ for (Demangle::Node::iterator child_pos = cur_node->begin();
+ child_pos != child_end; ++child_pos) {
+ auto child = *child_pos;
+ const Demangle::Node::Kind childKind = child->getKind();
+
+ switch (childKind) {
+ case Demangle::Node::Kind::Identifier:
+ break;
+ default:
+ VisitNode(ast, *child_pos, result);
+ break;
+ }
+ }
+}
+
static void VisitNode(
ASTContext *ast,
Demangle::NodePointer node, VisitNodeResult &result) {
@@ -2222,6 +2223,9 @@
break;
case Demangle::Node::Kind::Global:
+ VisitNodeGlobal(ast, node, result);
+ break;
+
case Demangle::Node::Kind::Static:
case Demangle::Node::Kind::Type:
case Demangle::Node::Kind::TypeMangling:
@@ -2229,6 +2233,7 @@
VisitAllChildNodes(ast, node, result);
break;
+ case Demangle::Node::Kind::Allocator:
case Demangle::Node::Kind::Constructor:
VisitNodeConstructor(ast, node, result);
break;
@@ -2254,7 +2259,6 @@
break;
case Demangle::Node::Kind::Function:
- case Demangle::Node::Kind::Allocator:
case Demangle::Node::Kind::Variable:
case Demangle::Node::Kind::Subscript: // Out of order on purpose
VisitNodeFunction(ast, node, result);
diff --git a/lib/IRGen/DebugTypeInfo.cpp b/lib/IRGen/DebugTypeInfo.cpp
index 732ac27..49faa97 100644
--- a/lib/IRGen/DebugTypeInfo.cpp
+++ b/lib/IRGen/DebugTypeInfo.cpp
@@ -145,9 +145,7 @@
TypeDecl *DebugTypeInfo::getDecl() const {
if (auto *N = dyn_cast<NominalType>(Type))
return N->getDecl();
- if (auto *TA = dyn_cast<NameAliasType>(Type))
- return TA->getDecl();
- if (auto *BTA = dyn_cast<BoundNameAliasType>(Type))
+ if (auto *BTA = dyn_cast<NameAliasType>(Type))
return BTA->getDecl();
if (auto *UBG = dyn_cast<UnboundGenericType>(Type))
return UBG->getDecl();
diff --git a/lib/IRGen/GenClass.cpp b/lib/IRGen/GenClass.cpp
index c8c54bb..64cbec31 100644
--- a/lib/IRGen/GenClass.cpp
+++ b/lib/IRGen/GenClass.cpp
@@ -1810,9 +1810,8 @@
break;
}
case FieldAccess::ConstantIndirect:
- // Otherwise, swift_initClassMetadata_UniversalStrategy() will point
- // the Objective-C runtime into the field offset vector of the
- // instantiated metadata.
+ // Otherwise, swift_initClassMetadata() will point the Objective-C
+ // runtime into the field offset vector of the instantiated metadata.
offsetPtr
= llvm::ConstantPointerNull::get(IGM.IntPtrTy->getPointerTo());
break;
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
index 04d1653..9a3cfc2 100644
--- a/lib/IRGen/GenDecl.cpp
+++ b/lib/IRGen/GenDecl.cpp
@@ -1633,8 +1633,15 @@
switch (getKind()) {
case Kind::DispatchThunk:
case Kind::DispatchThunkInitializer:
- case Kind::DispatchThunkAllocator:
+ case Kind::DispatchThunkAllocator: {
+ auto *decl = getDecl();
+
+ // Protocol requirements don't have their own access control
+ if (auto *proto = dyn_cast<ProtocolDecl>(decl->getDeclContext()))
+ decl = proto;
+
return ::isAvailableExternally(IGM, getDecl());
+ }
case Kind::ValueWitnessTable:
case Kind::TypeMetadata:
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
index 658a9f4..c07d802 100644
--- a/lib/IRGen/GenMeta.cpp
+++ b/lib/IRGen/GenMeta.cpp
@@ -1405,9 +1405,11 @@
auto numFields = IGF.IGM.getSize(Size(storedProperties.size()));
if (isa<ClassDecl>(target)) {
- IGF.Builder.CreateCall(IGF.IGM.getInitClassMetadataUniversalFn(),
- {metadata, numFields,
- fields.getAddress(), fieldVector});
+ ClassLayoutFlags flags = ClassLayoutFlags::Swift5Algorithm;
+
+ IGF.Builder.CreateCall(IGF.IGM.getInitClassMetadataFn(),
+ {metadata, IGF.IGM.getSize(Size(uintptr_t(flags))),
+ numFields, fields.getAddress(), fieldVector});
} else {
assert(isa<StructDecl>(target));
StructLayoutFlags flags = StructLayoutFlags::Swift5Algorithm;
@@ -3555,6 +3557,9 @@
// Flags.
reqt.addInt32(info.Flags.getIntValue());
+ // Dispatch thunk.
+ reqt.addRelativeAddressOrNull(info.Thunk);
+
// Default implementation.
reqt.addRelativeAddressOrNull(info.DefaultImpl);
#ifndef NDEBUG
@@ -3592,6 +3597,7 @@
struct RequirementInfo {
ProtocolRequirementFlags Flags;
+ llvm::Constant *Thunk;
llvm::Constant *DefaultImpl;
};
@@ -3601,36 +3607,41 @@
if (entry.isBase()) {
assert(entry.isOutOfLineBase());
auto flags = Flags(Flags::Kind::BaseProtocol);
- return { flags, nullptr };
+ return { flags, nullptr, nullptr };
}
if (entry.isAssociatedType()) {
auto flags = Flags(Flags::Kind::AssociatedTypeAccessFunction);
- return { flags, nullptr };
+ return { flags, nullptr, nullptr };
}
if (entry.isAssociatedConformance()) {
auto flags = Flags(Flags::Kind::AssociatedConformanceAccessFunction);
- return { flags, nullptr };
+ return { flags, nullptr, nullptr };
}
assert(entry.isFunction());
- auto func = entry.getFunction();
+ SILDeclRef func(entry.getFunction());
+
+ // Look up the dispatch thunk if the protocol is resilient.
+ llvm::Constant *thunk = nullptr;
+ if (Protocol->isResilient())
+ thunk = IGM.getAddrOfDispatchThunk(func, NotForDefinition);
// Classify the function.
- auto flags = getMethodDescriptorFlags<Flags>(func);
+ auto flags = getMethodDescriptorFlags<Flags>(func.getDecl());
// Look for a default witness.
llvm::Constant *defaultImpl = findDefaultWitness(func);
- return { flags, defaultImpl };
+ return { flags, thunk, defaultImpl };
}
- llvm::Constant *findDefaultWitness(AbstractFunctionDecl *func) {
+ llvm::Constant *findDefaultWitness(SILDeclRef func) {
if (!DefaultWitnesses) return nullptr;
for (auto &entry : DefaultWitnesses->getResilientDefaultEntries()) {
- if (entry.getRequirement().getDecl() != func)
+ if (entry.getRequirement() != func)
continue;
return IGM.getAddrOfSILFunction(entry.getWitness(), NotForDefinition);
}
diff --git a/lib/IRGen/GenProto.cpp b/lib/IRGen/GenProto.cpp
index c284eb1..2902b11 100644
--- a/lib/IRGen/GenProto.cpp
+++ b/lib/IRGen/GenProto.cpp
@@ -730,18 +730,6 @@
}
namespace {
- /// A concrete witness table, together with its known layout.
- class WitnessTable {
- llvm::Value *Table;
- const ProtocolInfo &Info;
- public:
- WitnessTable(llvm::Value *wtable, const ProtocolInfo &info)
- : Table(wtable), Info(info) {}
-
- llvm::Value *getTable() const { return Table; }
- const ProtocolInfo &getInfo() const { return Info; }
- };
-
/// A class which lays out a witness table in the abstract.
class WitnessTableLayout : public SILWitnessVisitor<WitnessTableLayout> {
SmallVector<WitnessTableEntry, 16> Entries;
@@ -1194,8 +1182,7 @@
: IGM(IGM), Table(table),
ConcreteType(SILWT->getConformance()->getDeclContext()
->mapTypeIntoContext(
- SILWT->getConformance()->getType()
- ->getCanonicalType())
+ SILWT->getConformance()->getType())
->getCanonicalType()),
Conformance(*SILWT->getConformance()),
ConformanceInContext(mapConformanceIntoContext(IGM,
@@ -1271,12 +1258,6 @@
auto &entry = SILEntries.front();
SILEntries = SILEntries.slice(1);
- // Handle missing optional requirements.
- if (entry.getKind() == SILWitnessTable::MissingOptional) {
- Table.addNullPointer(IGM.Int8PtrTy);
- return;
- }
-
#ifndef NDEBUG
assert(entry.getKind() == SILWitnessTable::Method
&& "sil witness table does not match protocol");
diff --git a/lib/IRGen/GenThunk.cpp b/lib/IRGen/GenThunk.cpp
index c72ada5..38633c7 100644
--- a/lib/IRGen/GenThunk.cpp
+++ b/lib/IRGen/GenThunk.cpp
@@ -50,7 +50,8 @@
Signature signature = getSignature(fnType);
LinkInfo link = LinkInfo::get(*this, entity, forDefinition);
- return createFunction(*this, link, signature);
+ entry = createFunction(*this, link, signature);
+ return entry;
}
static FunctionPointer lookupMethod(IRGenFunction &IGF,
diff --git a/lib/IRGen/IRGenDebugInfo.cpp b/lib/IRGen/IRGenDebugInfo.cpp
index f199612..d6f3485 100644
--- a/lib/IRGen/IRGenDebugInfo.cpp
+++ b/lib/IRGen/IRGenDebugInfo.cpp
@@ -1277,7 +1277,6 @@
// Sugared types.
case TypeKind::NameAlias: {
-
auto *NameAliasTy = cast<NameAliasType>(BaseTy);
auto *Decl = NameAliasTy->getDecl();
auto L = getDebugLoc(*this, Decl);
@@ -1286,22 +1285,6 @@
// For NameAlias types, the DeclContext for the aliasED type is
// in the decl of the alias type.
DebugTypeInfo AliasedDbgTy(
- DbgTy.getDeclContext(), DbgTy.getGenericEnvironment(), AliasedTy,
- DbgTy.StorageType, DbgTy.size, DbgTy.align, DbgTy.DefaultAlignment);
- return DBuilder.createTypedef(getOrCreateType(AliasedDbgTy), MangledName,
- File, L.Line, File);
- }
-
- case TypeKind::BoundNameAlias: {
- // FIXME: Cloned from the above.
- auto *NameAliasTy = cast<BoundNameAliasType>(BaseTy);
- auto *Decl = NameAliasTy->getDecl();
- auto L = getDebugLoc(*this, Decl);
- auto AliasedTy = NameAliasTy->getSinglyDesugaredType();
- auto File = getOrCreateFile(L.Filename);
- // For NameAlias types, the DeclContext for the aliasED type is
- // in the decl of the alias type.
- DebugTypeInfo AliasedDbgTy(
DbgTy.getDeclContext(), DbgTy.getGenericEnvironment(), AliasedTy,
DbgTy.StorageType, DbgTy.size, DbgTy.align, DbgTy.DefaultAlignment);
return DBuilder.createTypedef(getOrCreateType(AliasedDbgTy), MangledName,
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
index ee86454..62ec5c0 100644
--- a/lib/IRGen/IRGenModule.cpp
+++ b/lib/IRGen/IRGenModule.cpp
@@ -217,6 +217,7 @@
ProtocolRequirementStructTy =
createStructType(*this, "swift.protocol_requirement", {
Int32Ty, // flags
+ Int32Ty, // thunk
Int32Ty // default implementation
});
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
index e2e8284..10f82fc 100644
--- a/lib/IRGen/IRGenSIL.cpp
+++ b/lib/IRGen/IRGenSIL.cpp
@@ -28,6 +28,7 @@
#include "llvm/ADT/TinyPtrVector.h"
#include "llvm/Support/SaveAndRestore.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Transforms/Utils/Local.h"
#include "clang/AST/ASTContext.h"
#include "clang/Basic/TargetInfo.h"
#include "swift/Basic/ExternalUnion.h"
@@ -646,6 +647,41 @@
return Name;
}
+ /// Try to emit an inline assembly gadget which extends the lifetime of
+ /// \p Var. Returns whether or not this was successful.
+ bool emitLifetimeExtendingUse(llvm::Value *Var) {
+ llvm::Type *ArgTys;
+ auto *Ty = Var->getType();
+ // Vectors, Pointers and Floats are expected to fit into a register.
+ if (Ty->isPointerTy() || Ty->isFloatingPointTy() || Ty->isVectorTy())
+ ArgTys = {Ty};
+ else {
+ // If this is not a scalar or vector type, we can't handle it.
+ if (isa<llvm::CompositeType>(Ty))
+ return false;
+ // The storage is guaranteed to be no larger than the register width.
+ // Extend the storage so it would fit into a register.
+ llvm::Type *IntTy;
+ switch (IGM.getClangASTContext().getTargetInfo().getRegisterWidth()) {
+ case 64:
+ IntTy = IGM.Int64Ty;
+ break;
+ case 32:
+ IntTy = IGM.Int32Ty;
+ break;
+ default:
+ llvm_unreachable("unsupported register width");
+ }
+ ArgTys = {IntTy};
+ Var = Builder.CreateZExtOrBitCast(Var, IntTy);
+ }
+ // Emit an empty inline assembler expression depending on the register.
+ auto *AsmFnTy = llvm::FunctionType::get(IGM.VoidTy, ArgTys, false);
+ auto *InlineAsm = llvm::InlineAsm::get(AsmFnTy, "", "r", true);
+ Builder.CreateAsmCall(InlineAsm, Var);
+ return true;
+ }
+
/// At -Onone, forcibly keep all LLVM values that are tracked by
/// debug variables alive by inserting an empty inline assembler
/// expression depending on the value in the blocks dominated by the
@@ -654,53 +690,31 @@
if (IGM.IRGen.Opts.shouldOptimize())
return;
for (auto &Variable : ValueDomPoints) {
- auto VarDominancePoint = Variable.second;
- llvm::Value *Storage = Variable.first;
+ llvm::Instruction *Var = Variable.first;
+ DominancePoint VarDominancePoint = Variable.second;
if (getActiveDominancePoint() == VarDominancePoint ||
isActiveDominancePointDominatedBy(VarDominancePoint)) {
- llvm::Type *ArgTys;
- auto *Ty = Storage->getType();
- // Vectors, Pointers and Floats are expected to fit into a register.
- if (Ty->isPointerTy() || Ty->isFloatingPointTy() || Ty->isVectorTy())
- ArgTys = { Ty };
- else {
- // If this is not a scalar or vector type, we can't handle it.
- if (isa<llvm::CompositeType>(Ty))
- continue;
- // The storage is guaranteed to be no larger than the register width.
- // Extend the storage so it would fit into a register.
- llvm::Type *IntTy;
- switch (IGM.getClangASTContext().getTargetInfo().getRegisterWidth()) {
- case 64: IntTy = IGM.Int64Ty; break;
- case 32: IntTy = IGM.Int32Ty; break;
- default: llvm_unreachable("unsupported register width");
- }
- ArgTys = { IntTy };
- Storage = Builder.CreateZExtOrBitCast(Storage, IntTy);
- }
- // Emit an empty inline assembler expression depending on the register.
- auto *AsmFnTy = llvm::FunctionType::get(IGM.VoidTy, ArgTys, false);
- auto *InlineAsm = llvm::InlineAsm::get(AsmFnTy, "", "r", true);
- Builder.CreateAsmCall(InlineAsm, Storage);
- // Propagate the dbg.value intrinsics into the later basic blocks. Note
+ bool ExtendedLifetime = emitLifetimeExtendingUse(Var);
+ if (!ExtendedLifetime)
+ continue;
+
+ // Propagate dbg.values for Var into the current basic block. Note
// that this shouldn't be necessary. LiveDebugValues should be doing
// this but can't in general because it currently only tracks register
// locations.
- llvm::Instruction *Value = Variable.first;
- auto It = llvm::BasicBlock::iterator(Value);
- auto *BB = Value->getParent();
- auto *CurBB = Builder.GetInsertBlock();
- if (BB != CurBB)
- for (auto I = std::next(It), E = BB->end(); I != E; ++I) {
- auto *DVI = dyn_cast<llvm::DbgValueInst>(I);
- if (DVI && DVI->getValue() == Value)
- IGM.DebugInfo->getBuilder().insertDbgValueIntrinsic(
- DVI->getValue(), DVI->getVariable(), DVI->getExpression(),
- DVI->getDebugLoc(), &*CurBB->getFirstInsertionPt());
- else
- // Found all dbg.value intrinsics describing this location.
- break;
- }
+ llvm::BasicBlock *BB = Var->getParent();
+ llvm::BasicBlock *CurBB = Builder.GetInsertBlock();
+ if (BB == CurBB)
+ // The current basic block must be a successor of the dbg.value().
+ continue;
+
+ llvm::SmallVector<llvm::DbgValueInst *, 4> DbgValues;
+ llvm::findDbgValues(DbgValues, Var);
+ for (auto *DVI : DbgValues)
+ if (DVI->getParent() == BB)
+ IGM.DebugInfo->getBuilder().insertDbgValueIntrinsic(
+ DVI->getValue(), DVI->getVariable(), DVI->getExpression(),
+ DVI->getDebugLoc(), &*CurBB->getFirstInsertionPt());
}
}
}
@@ -754,10 +768,18 @@
if (ArgNo == 0)
// Otherwise only if debug value range extension is not feasible.
if (!needsShadowCopy(Storage)) {
- // Mark for debug value range extension unless this is a constant.
- if (auto *Value = dyn_cast<llvm::Instruction>(Storage))
- if (ValueVariables.insert(Value).second)
- ValueDomPoints.push_back({Value, getActiveDominancePoint()});
+ // Mark for debug value range extension unless this is a constant, or
+ // unless it's not possible to emit lifetime-extending uses for this.
+ if (auto *Value = dyn_cast<llvm::Instruction>(Storage)) {
+ // Emit a use at the start of the storage lifetime to force early
+ // materialization. This makes variables available for inspection as
+ // soon as they are defined.
+ bool ExtendedLifetime = emitLifetimeExtendingUse(Value);
+ if (ExtendedLifetime)
+ if (ValueVariables.insert(Value).second)
+ ValueDomPoints.push_back({Value, getActiveDominancePoint()});
+ }
+
return Storage;
}
return emitShadowCopy(Storage, Scope, Name, ArgNo, Align);
diff --git a/lib/PrintAsObjC/PrintAsObjC.cpp b/lib/PrintAsObjC/PrintAsObjC.cpp
index c6a33b2..3238022 100644
--- a/lib/PrintAsObjC/PrintAsObjC.cpp
+++ b/lib/PrintAsObjC/PrintAsObjC.cpp
@@ -1476,38 +1476,44 @@
clangTy->isObjCObjectPointerType();
}
- void visitNameAliasType(NameAliasType *aliasTy,
+ bool printImportedAlias(const TypeAliasDecl *alias,
Optional<OptionalTypeKind> optionalKind) {
+ if (!alias->hasClangNode()) {
+ if (!alias->isObjC()) return false;
+
+ os << alias->getName();
+ return true;
+ }
+
+ if (auto *clangTypeDecl =
+ dyn_cast<clang::TypeDecl>(alias->getClangDecl())) {
+ maybePrintTagKeyword(alias);
+ os << getNameForObjC(alias);
+
+ if (isClangPointerType(clangTypeDecl))
+ printNullability(optionalKind);
+ } else if (auto *clangObjCClass
+ = dyn_cast<clang::ObjCInterfaceDecl>(alias->getClangDecl())){
+ os << clangObjCClass->getName() << " *";
+ printNullability(optionalKind);
+ } else {
+ auto *clangCompatAlias =
+ cast<clang::ObjCCompatibleAliasDecl>(alias->getClangDecl());
+ os << clangCompatAlias->getName() << " *";
+ printNullability(optionalKind);
+ }
+
+ return true;
+ }
+
+ void visitNameAliasType(NameAliasType *aliasTy,
+ Optional<OptionalTypeKind> optionalKind) {
const TypeAliasDecl *alias = aliasTy->getDecl();
if (printIfKnownSimpleType(alias, optionalKind))
return;
- if (alias->hasClangNode()) {
- if (auto *clangTypeDecl =
- dyn_cast<clang::TypeDecl>(alias->getClangDecl())) {
- maybePrintTagKeyword(alias);
- os << getNameForObjC(alias);
-
- if (isClangPointerType(clangTypeDecl))
- printNullability(optionalKind);
- } else if (auto *clangObjCClass
- = dyn_cast<clang::ObjCInterfaceDecl>(alias->getClangDecl())){
- os << clangObjCClass->getName() << " *";
- printNullability(optionalKind);
- } else {
- auto *clangCompatAlias =
- cast<clang::ObjCCompatibleAliasDecl>(alias->getClangDecl());
- os << clangCompatAlias->getName() << " *";
- printNullability(optionalKind);
- }
-
+ if (printImportedAlias(alias, optionalKind))
return;
- }
-
- if (alias->isObjC()) {
- os << alias->getName();
- return;
- }
visitPart(alias->getUnderlyingTypeLoc().getType(), optionalKind);
}
diff --git a/lib/SIL/SILPrinter.cpp b/lib/SIL/SILPrinter.cpp
index 726611d..c5b54a6 100644
--- a/lib/SIL/SILPrinter.cpp
+++ b/lib/SIL/SILPrinter.cpp
@@ -2654,7 +2654,8 @@
break;
}
- OS << "\n\nimport Builtin\nimport " << STDLIB_NAME
+ OS << "\n\nimport " << BUILTIN_NAME
+ << "\nimport " << STDLIB_NAME
<< "\nimport " << SWIFT_SHIMS_NAME << "\n\n";
// Print the declarations and types from the associated context (origin module or
@@ -2856,13 +2857,6 @@
baseProtoWitness.Witness->printName(OS, Options);
break;
}
- case MissingOptional: {
- // optional requirement 'declref': <<not present>>
- OS << "optional requirement '"
- << witness.getMissingOptionalWitness().Witness->getBaseName()
- << "': <<not present>>";
- break;
- }
}
OS << '\n';
}
diff --git a/lib/SIL/SILWitnessTable.cpp b/lib/SIL/SILWitnessTable.cpp
index c69dd8d..732c3a7 100644
--- a/lib/SIL/SILWitnessTable.cpp
+++ b/lib/SIL/SILWitnessTable.cpp
@@ -116,7 +116,6 @@
case AssociatedType:
case AssociatedTypeProtocol:
case BaseProtocol:
- case MissingOptional:
case Invalid:
break;
}
@@ -146,7 +145,6 @@
case AssociatedType:
case AssociatedTypeProtocol:
case BaseProtocol:
- case MissingOptional:
case Invalid:
break;
}
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
index 42c19d3..a6c5d89 100644
--- a/lib/SILGen/SILGenExpr.cpp
+++ b/lib/SILGen/SILGenExpr.cpp
@@ -3433,7 +3433,7 @@
auto indexLoweredTy = SGM.Types.getLoweredType(indexTupleTy);
// Get or create the equals witness
[&unsafeRawPointerTy, &boolTy, &genericSig, &C, &indexTypes, &equals, &loc,
- &SGM, &genericEnv, &indexLoweredTy, &hashableProto, &indexes]{
+ &SGM, &genericEnv, &indexLoweredTy, &indexes]{
// (RawPointer, RawPointer) -> Bool
SmallVector<SILParameterInfo, 2> params;
params.push_back({unsafeRawPointerTy,
@@ -3448,7 +3448,7 @@
SILFunctionType::ExtInfo(SILFunctionType::Representation::Thin,
/*pseudogeneric*/ false,
/*noescape*/ false),
- SILCoroutineKind::None,
+ SILCoroutineKind::None,
ParameterConvention::Direct_Unowned,
params, /*yields*/ {}, results, None, C);
@@ -3486,42 +3486,37 @@
auto equalsRef = SILDeclRef(equalsMethod);
auto equalsTy = subSGF.SGM.Types.getConstantType(equalsRef);
- auto hashableSig = C.getExistentialSignature(
- hashableProto->getDeclaredType()->getCanonicalType(),
- SGM.M.getSwiftModule());
-
auto isFalseBB = subSGF.createBasicBlock();
auto i1Ty = SILType::getBuiltinIntegerType(1, C);
for (unsigned i : indices(indexes)) {
auto &index = indexes[i];
- auto formalTy = index.FormalType;
- auto hashable = index.Hashable;
- if (genericEnv) {
- formalTy = genericEnv->mapTypeIntoContext(formalTy)->getCanonicalType();
- hashable = hashable.subst(index.FormalType,
- [&](Type t) -> Type { return genericEnv->mapTypeIntoContext(t); },
- LookUpConformanceInSignature(*genericSig));
- }
+ Type formalTy = index.FormalType;
+ ProtocolConformanceRef hashable = index.Hashable;
+ std::tie(formalTy, hashable)
+ = GenericEnvironment::mapConformanceRefIntoContext(genericEnv,
+ formalTy,
+ hashable);
+ auto formalCanTy = formalTy->getCanonicalType(genericSig);
- // Get the Equatable conformance from the Hashable conformance
- auto subMap = hashableSig->getSubstitutionMap(
- Substitution(formalTy, hashable));
- auto equatable = *subMap
- .lookupConformance(CanType(hashableSig->getGenericParams()[0]),
- equatableProtocol);
+ // Get the Equatable conformance from the Hashable conformance.
+ auto equatable = hashable.getAssociatedConformance(formalTy,
+ GenericTypeParamType::get(0, 0, C),
+ equatableProtocol);
assert(equatable.isAbstract() == hashable.isAbstract());
if (equatable.isConcrete())
assert(equatable.getConcrete()->getType()->isEqual(
hashable.getConcrete()->getType()));
- auto equatableSub = Substitution(formalTy,
- C.AllocateCopy(ArrayRef<ProtocolConformanceRef>(equatable)));
auto equalsWitness = subSGF.B.createWitnessMethod(loc,
- formalTy, equatable,
+ formalCanTy, equatable,
equalsRef, equalsTy);
+ auto equatableSub
+ = SubstitutionMap::getProtocolSubstitutions(equatableProtocol,
+ formalCanTy,
+ equatable);
auto equalsSubstTy = equalsTy.castTo<SILFunctionType>()
->substGenericArgs(SGM.M, equatableSub);
auto equalsInfo = CalleeTypeInfo(equalsSubstTy,
@@ -3554,7 +3549,7 @@
rhsArg = subSGF.emitManagedBufferWithCleanup(rhsBuf);
}
- auto metaty = CanMetatypeType::get(formalTy,
+ auto metaty = CanMetatypeType::get(formalCanTy,
MetatypeRepresentation::Thick);
auto metatyValue = ManagedValue::forUnmanaged(subSGF.B.createMetatype(loc,
SILType::getPrimitiveObjectType(metaty)));
@@ -3564,14 +3559,17 @@
equalsInfo, loc, SGFContext());
ArgumentScope argScope(subSGF, loc);
PostponedCleanup postpone(subSGF);
- isEqual =
- subSGF
- .emitApply(std::move(equalsResultPlan), std::move(argScope),
- loc, ManagedValue::forUnmanaged(equalsWitness),
- equatableSub, {lhsArg, rhsArg, metatyValue},
- equalsInfo, ApplyOptions::None, SGFContext(),
- postpone)
- .getUnmanagedSingleValue(subSGF, loc);
+ SmallVector<Substitution, 1> equatableSubListBuf;
+ equatableProtocol->getGenericSignature()
+ ->getSubstitutions(equatableSub, equatableSubListBuf);
+ isEqual = subSGF
+ .emitApply(std::move(equalsResultPlan), std::move(argScope),
+ loc, ManagedValue::forUnmanaged(equalsWitness),
+ C.AllocateCopy(equatableSubListBuf),
+ {lhsArg, rhsArg, metatyValue},
+ equalsInfo, ApplyOptions::None, SGFContext(),
+ postpone)
+ .getUnmanagedSingleValue(subSGF, loc);
}
branchScope.pop();
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
index b66aefa..38908c5 100644
--- a/lib/SILGen/SILGenType.cpp
+++ b/lib/SILGen/SILGenType.cpp
@@ -478,16 +478,6 @@
IsFreeFunctionWitness_t isFree,
Witness witness) {
// Emit the witness thunk and add it to the table.
-
- // If this is a non-present optional requirement, emit a MissingOptional.
- if (!witnessRef) {
- auto *fd = requirementRef.getDecl();
- assert(fd->getAttrs().hasAttribute<OptionalAttr>() &&
- "Non-optional protocol requirement lacks a witness?");
- Entries.push_back(SILWitnessTable::MissingOptionalWitness{ fd });
- return;
- }
-
auto witnessLinkage = witnessRef.getLinkage(ForDefinition);
auto witnessSerialized = Serialized;
if (witnessSerialized &&
diff --git a/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp b/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp
index 9ea6307..14a87a3 100644
--- a/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp
+++ b/lib/SILOptimizer/IPO/DeadFunctionElimination.cpp
@@ -177,7 +177,6 @@
break;
case SILWitnessTable::Invalid:
- case SILWitnessTable::MissingOptional:
case SILWitnessTable::AssociatedType:
break;
}
diff --git a/lib/SILOptimizer/IPO/GlobalOpt.cpp b/lib/SILOptimizer/IPO/GlobalOpt.cpp
index 44589fb..6c2c004 100644
--- a/lib/SILOptimizer/IPO/GlobalOpt.cpp
+++ b/lib/SILOptimizer/IPO/GlobalOpt.cpp
@@ -27,9 +27,11 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "swift/AST/ASTMangler.h"
+
using namespace swift;
namespace {
+
/// Optimize the placement of global initializers.
///
/// TODO:
@@ -47,61 +49,99 @@
/// constant propagation in case of statically initialized "lets".
class SILGlobalOpt {
SILModule *Module;
- DominanceAnalysis* DA;
+ DominanceAnalysis *DA;
bool HasChanged = false;
- // Map each global initializer to a list of call sites.
typedef SmallVector<ApplyInst *, 4> GlobalInitCalls;
typedef SmallVector<LoadInst *, 4> GlobalLoads;
- llvm::MapVector<SILFunction*, GlobalInitCalls> GlobalInitCallMap;
+
+ /// A map from each visited global initializer call to a list of call sites.
+ llvm::MapVector<SILFunction *, GlobalInitCalls> GlobalInitCallMap;
// The following mappings are used if this is a compilation
// in scripting mode and global variables are accessed without
// addressors.
- // Map each global let variable to a set of loads from it.
- llvm::MapVector<SILGlobalVariable*, GlobalLoads> GlobalLoadMap;
- // Map each global let variable to the store instruction which initializes it.
- llvm::MapVector<SILGlobalVariable*, StoreInst *> GlobalVarStore;
- // Variables in this set should not be processed by this pass
- // anymore.
- llvm::SmallPtrSet<SILGlobalVariable*, 16> GlobalVarSkipProcessing;
+ /// A map from each visited global let variable to its set of loads.
+ llvm::MapVector<SILGlobalVariable *, GlobalLoads> GlobalLoadMap;
- // Mark any block that this pass has determined to be inside a loop.
- llvm::DenseSet<SILBasicBlock*> LoopBlocks;
- // Mark any functions for which loops have been analyzed.
- llvm::DenseSet<SILFunction*> LoopCheckedFunctions;
- // Keep track of cold blocks.
- ColdBlockInfo ColdBlocks;
+ /// A map from each visited global let variable to the store instructions
+ /// which initialize it.
+ llvm::MapVector<SILGlobalVariable *, StoreInst *> GlobalVarStore;
- // Whether we see a "once" call to callees that we currently don't handle.
+ /// A set of visited global variables that for some reason we have decided is
+ /// not able to be optimized safely or for which we do not know how to
+ /// optimize safely.
+ ///
+ /// Once a global variable is in this set, we no longer will process it.
+ llvm::SmallPtrSet<SILGlobalVariable *, 16> GlobalVarSkipProcessing;
+
+ /// The set of blocks that this pass has determined to be inside a loop.
+ ///
+ /// This is used to mark any block that this pass has determined to be inside
+ /// a loop.
+ llvm::DenseSet<SILBasicBlock *> LoopBlocks;
+
+ /// The set of functions that have had their loops analyzed.
+ llvm::DenseSet<SILFunction *> LoopCheckedFunctions;
+
+ /// Whether we have seen any "once" calls to callees that we currently don't
+ /// handle.
bool UnhandledOnceCallee = false;
- // Record number of times a globalinit_func is called by "once".
- llvm::DenseMap<SILFunction*, unsigned> InitializerCount;
+
+ /// A map from a globalinit_func to the number of times "once" has called the
+ /// function.
+ llvm::DenseMap<SILFunction *, unsigned> InitializerCount;
public:
SILGlobalOpt(SILModule *M, DominanceAnalysis *DA)
- : Module(M), DA(DA), ColdBlocks(DA) {}
+ : Module(M), DA(DA) {}
bool run();
protected:
+ /// If this is a call to a global initializer, map it.
void collectGlobalInitCall(ApplyInst *AI);
+
+ /// If this load is a read from a global let variable, add the load to
+ /// GlobalLoadMap[SILG].
void collectGlobalLoad(LoadInst *SI, SILGlobalVariable *SILG);
+
+ /// If this store is a write to a global let variable, add the store to
+ /// GlobalStoreMap[SILG].
void collectGlobalStore(StoreInst *SI, SILGlobalVariable *SILG);
+
+ /// This is the main entrypoint for collecting global accesses.
void collectGlobalAccess(GlobalAddrInst *GAI);
SILGlobalVariable *getVariableOfGlobalInit(SILFunction *AddrF);
- bool isInLoop(SILBasicBlock *CurBB);
- void placeInitializers(SILFunction *InitF, ArrayRef<ApplyInst*> Calls);
- // Update UnhandledOnceCallee and InitializerCount by going through all "once"
- // calls.
+ /// Returns true if we think that \p CurBB is inside a loop.
+ bool isInLoop(SILBasicBlock *CurBB);
+
+ /// Given that we are trying to place initializers in new locations, see if
+ /// we can hoist the passed in apply \p AI out of any loops that it is
+ /// currently within.
+ ApplyInst *getHoistedApplyForInitializer(
+ ApplyInst *AI, DominanceInfo *DT, SILFunction *InitF,
+ SILFunction *ParentF,
+ llvm::DenseMap<SILFunction *, ApplyInst *> &ParentFuncs);
+
+ void placeInitializers(SILFunction *InitF, ArrayRef<ApplyInst *> Calls);
+
+ /// Update UnhandledOnceCallee and InitializerCount by going through all
+ /// "once" calls.
void collectOnceCall(BuiltinInst *AI);
- // Set the static initializer and remove "once" from addressor if a global can
- // be statically initialized.
+
+ /// Set the static initializer and remove "once" from addressor if a global
+ /// can be statically initialized.
void optimizeInitializer(SILFunction *AddrF, GlobalInitCalls &Calls);
+
+ /// Optimize access to the global variable, which is known to have a constant
+ /// value. Replace all loads from the global address by invocations of a
+ /// getter that returns the value of this variable.
void optimizeGlobalAccess(SILGlobalVariable *SILG, StoreInst *SI);
- // Replace loads from a global variable by the known value.
+
+ /// Replace loads from a global variable by the known value.
void replaceLoadsByKnownValue(BuiltinInst *CallToOnce,
SILFunction *AddrF,
SILFunction *InitF,
@@ -118,11 +158,11 @@
ArrayRef<SILInstruction *> Insns;
- protected:
+protected:
SILBasicBlock *FromBB, *DestBB;
- public:
- // A map of old to new available values.
+public:
+ /// A map of old to new available values.
SmallVector<std::pair<ValueBase *, SILValue>, 16> AvailVals;
InstructionsCloner(SILFunction &F,
@@ -147,7 +187,7 @@
AvailVals.push_back(std::make_pair(origResults[i], clonedResults[i]));
}
- // Clone all instructions from Insns into DestBB
+ /// Clone all instructions from Insns into DestBB
void clone() {
for (auto I : Insns)
process(I);
@@ -156,7 +196,7 @@
} // end anonymous namespace
-/// If this is a call to a global initializer, map it.
+// If this is a call to a global initializer, map it.
void SILGlobalOpt::collectGlobalInitCall(ApplyInst *AI) {
SILFunction *F = AI->getReferencedFunction();
if (!F || !F->isGlobalInit())
@@ -165,10 +205,10 @@
GlobalInitCallMap[F].push_back(AI);
}
-/// If this is a read from a global let variable, map it.
+// Map the load if this load is a read from a global variable that is either a
+// let or a global variable that can not be changed externally
void SILGlobalOpt::collectGlobalLoad(LoadInst *LI, SILGlobalVariable *SILG) {
assert(SILG);
- //assert(SILG->isLet());
// This is read from a let variable.
// Figure out if the value of this variable is statically known.
@@ -237,8 +277,8 @@
IsBare, IsNotTransparent, Serialized);
}
-/// Generate getter from the initialization code whose
-/// result is stored by a given store instruction.
+/// Generate getter from the initialization code whose result is stored by a
+/// given store instruction.
static SILFunction *genGetterFromInit(StoreInst *Store,
SILGlobalVariable *SILG) {
auto *varDecl = SILG->getDecl();
@@ -248,17 +288,14 @@
auto V = Store->getSrc();
- SmallVector<SILInstruction *, 8> ReverseInsns;
- SmallVector<SILInstruction *, 8> Insns;
- ReverseInsns.push_back(Store);
- ReverseInsns.push_back(dyn_cast<SingleValueInstruction>(Store->getDest()));
- if (!analyzeStaticInitializer(V, ReverseInsns))
+ SmallVector<SILInstruction *, 8> Insts;
+ Insts.push_back(Store);
+ Insts.push_back(cast<SingleValueInstruction>(Store->getDest()));
+ if (!analyzeStaticInitializer(V, Insts))
return nullptr;
// Produce a correct order of instructions.
- while (!ReverseInsns.empty()) {
- Insns.push_back(ReverseInsns.pop_back_val());
- }
+ std::reverse(Insts.begin(), Insts.end());
auto *GetterF = getGlobalGetterFunction(Store->getModule(),
Store->getLoc(),
@@ -270,7 +307,7 @@
auto *EntryBB = GetterF->createBasicBlock();
// Copy instructions into GetterF
- InstructionsCloner Cloner(*GetterF, Insns, EntryBB);
+ InstructionsCloner Cloner(*GetterF, Insts, EntryBB);
Cloner.clone();
GetterF->setInlined();
@@ -299,7 +336,7 @@
return GetterF;
}
-/// If this is a read from a global let variable, map it.
+// If this is a write to a global let variable, map it.
void SILGlobalOpt::collectGlobalStore(StoreInst *SI, SILGlobalVariable *SILG) {
if (GlobalVarStore.count(SILG)) {
@@ -327,8 +364,8 @@
return nullptr;
}
-/// Update UnhandledOnceCallee and InitializerCount by going through all "once"
-/// calls.
+// Update UnhandledOnceCallee and InitializerCount by going through all "once"
+// calls.
void SILGlobalOpt::collectOnceCall(BuiltinInst *BI) {
if (UnhandledOnceCallee)
return;
@@ -410,6 +447,48 @@
}
}
+ApplyInst *SILGlobalOpt::getHoistedApplyForInitializer(
+ ApplyInst *AI, DominanceInfo *DT, SILFunction *InitF, SILFunction *ParentF,
+ llvm::DenseMap<SILFunction *, ApplyInst *> &ParentFuncs) {
+ auto PFI = ParentFuncs.find(ParentF);
+ if (PFI == ParentFuncs.end()) {
+ ParentFuncs[ParentF] = AI;
+
+ // It's the first time we found a call to InitF in this function, so we
+ // try to hoist it out of any loop.
+ return AI;
+ }
+
+ // Found a replacement for this init call. Ensure the replacement dominates
+ // the original call site.
+ ApplyInst *CommonAI = PFI->second;
+ assert(
+ cast<FunctionRefInst>(CommonAI->getCallee())->getReferencedFunction() ==
+ InitF &&
+ "ill-formed global init call");
+ SILBasicBlock *DomBB =
+ DT->findNearestCommonDominator(AI->getParent(), CommonAI->getParent());
+
+ // We must not move initializers around availability-checks.
+ if (isAvailabilityCheckOnDomPath(DomBB, CommonAI->getParent(), DT))
+ return nullptr;
+
+ ApplyInst *Result = nullptr;
+ if (DomBB != CommonAI->getParent()) {
+ CommonAI->moveBefore(&*DomBB->begin());
+ placeFuncRef(CommonAI, DT);
+
+ // Try to hoist the existing AI again if we move it to another block,
+ // e.g. from a loop exit into the loop.
+ Result = CommonAI;
+ }
+
+ AI->replaceAllUsesWith(CommonAI);
+ AI->eraseFromParent();
+ HasChanged = true;
+ return Result;
+}
+
/// Optimize placement of initializer calls given a list of calls to the
/// same initializer. All original initialization points must be dominated by
/// the final initialization calls.
@@ -417,82 +496,56 @@
/// The current heuristic hoists all initialization points within a function to
/// a single dominating call in the outer loop preheader.
void SILGlobalOpt::placeInitializers(SILFunction *InitF,
- ArrayRef<ApplyInst*> Calls) {
+ ArrayRef<ApplyInst *> Calls) {
DEBUG(llvm::dbgs() << "GlobalOpt: calls to "
<< Demangle::demangleSymbolAsString(InitF->getName())
<< " : " << Calls.size() << "\n");
// Map each initializer-containing function to its final initializer call.
- llvm::DenseMap<SILFunction*, ApplyInst*> ParentFuncs;
+ llvm::DenseMap<SILFunction *, ApplyInst *> ParentFuncs;
for (auto *AI : Calls) {
assert(AI->getNumArguments() == 0 && "ill-formed global init call");
assert(cast<FunctionRefInst>(AI->getCallee())->getReferencedFunction()
== InitF && "wrong init call");
-
SILFunction *ParentF = AI->getFunction();
DominanceInfo *DT = DA->get(ParentF);
- auto PFI = ParentFuncs.find(ParentF);
- ApplyInst *HoistAI = nullptr;
- if (PFI != ParentFuncs.end()) {
- // Found a replacement for this init call.
- // Ensure the replacement dominates the original call site.
- ApplyInst *CommonAI = PFI->second;
- assert(cast<FunctionRefInst>(CommonAI->getCallee())
- ->getReferencedFunction() == InitF &&
- "ill-formed global init call");
- SILBasicBlock *DomBB =
- DT->findNearestCommonDominator(AI->getParent(), CommonAI->getParent());
-
- // We must not move initializers around availability-checks.
- if (!isAvailabilityCheckOnDomPath(DomBB, CommonAI->getParent(), DT)) {
- if (DomBB != CommonAI->getParent()) {
- CommonAI->moveBefore(&*DomBB->begin());
- placeFuncRef(CommonAI, DT);
-
- // Try to hoist the existing AI again if we move it to another block,
- // e.g. from a loop exit into the loop.
- HoistAI = CommonAI;
- }
- AI->replaceAllUsesWith(CommonAI);
- AI->eraseFromParent();
- HasChanged = true;
- }
- } else {
- ParentFuncs[ParentF] = AI;
-
- // It's the first time we found a call to InitF in this function, so we
- // try to hoist it out of any loop.
- HoistAI = AI;
+ ApplyInst *HoistAI =
+ getHoistedApplyForInitializer(AI, DT, InitF, ParentF, ParentFuncs);
+
+ // If we were unable to find anything, just go onto the next apply.
+ if (!HoistAI) {
+ continue;
}
- if (HoistAI) {
- // Move this call to the outermost loop preheader.
- SILBasicBlock *BB = HoistAI->getParent();
- typedef llvm::DomTreeNodeBase<SILBasicBlock> DomTreeNode;
- DomTreeNode *Node = DT->getNode(BB);
- while (Node) {
- SILBasicBlock *DomParentBB = Node->getBlock();
- if (isAvailabilityCheck(DomParentBB)) {
- DEBUG(llvm::dbgs() << " don't hoist above availability check at bb"
- << DomParentBB->getDebugID() << "\n");
- break;
- }
- BB = DomParentBB;
- if (!isInLoop(BB))
- break;
- Node = Node->getIDom();
+
+ // Otherwise, move this call to the outermost loop preheader.
+ SILBasicBlock *BB = HoistAI->getParent();
+ typedef llvm::DomTreeNodeBase<SILBasicBlock> DomTreeNode;
+ DomTreeNode *Node = DT->getNode(BB);
+ while (Node) {
+ SILBasicBlock *DomParentBB = Node->getBlock();
+ if (isAvailabilityCheck(DomParentBB)) {
+ DEBUG(llvm::dbgs() << " don't hoist above availability check at bb"
+ << DomParentBB->getDebugID() << "\n");
+ break;
}
- if (BB == HoistAI->getParent()) {
- // BB is either unreachable or not in a loop.
- DEBUG(llvm::dbgs() << " skipping (not in a loop): " << *HoistAI
- << " in " << HoistAI->getFunction()->getName() << "\n");
- }
- else {
- DEBUG(llvm::dbgs() << " hoisting: " << *HoistAI
- << " in " << HoistAI->getFunction()->getName() << "\n");
- HoistAI->moveBefore(&*BB->begin());
- placeFuncRef(HoistAI, DT);
- HasChanged = true;
- }
+ BB = DomParentBB;
+ if (!isInLoop(BB))
+ break;
+ Node = Node->getIDom();
}
+
+ if (BB == HoistAI->getParent()) {
+ // BB is either unreachable or not in a loop.
+ DEBUG(llvm::dbgs() << " skipping (not in a loop): " << *HoistAI
+ << " in " << HoistAI->getFunction()->getName()
+ << "\n");
+ continue;
+ }
+
+ DEBUG(llvm::dbgs() << " hoisting: " << *HoistAI << " in "
+ << HoistAI->getFunction()->getName() << "\n");
+ HoistAI->moveBefore(&*BB->begin());
+ placeFuncRef(HoistAI, DT);
+ HasChanged = true;
}
}
@@ -659,10 +712,6 @@
return GVar;
}
-namespace {
-
-} // end anonymous namespace
-
/// Replace loads from a global variable by the known value.
void SILGlobalOpt::
replaceLoadsByKnownValue(BuiltinInst *CallToOnce, SILFunction *AddrF,
@@ -774,30 +823,29 @@
}
SILGlobalVariable *SILGlobalOpt::getVariableOfGlobalInit(SILFunction *AddrF) {
- if (AddrF->isGlobalInit()) {
- // If the addressor contains a single "once" call, it calls globalinit_func,
- // and the globalinit_func is called by "once" from a single location,
- // continue; otherwise bail.
- BuiltinInst *CallToOnce;
- auto *InitF = findInitializer(Module, AddrF, CallToOnce);
+ if (!AddrF->isGlobalInit())
+ return nullptr;
- if (!InitF || !InitF->getName().startswith("globalinit_")
- || InitializerCount[InitF] > 1)
- return nullptr;
+ // If the addressor contains a single "once" call, it calls globalinit_func,
+ // and the globalinit_func is called by "once" from a single location,
+ // continue; otherwise bail.
+ BuiltinInst *CallToOnce;
+ auto *InitF = findInitializer(Module, AddrF, CallToOnce);
- // If the globalinit_func is trivial, continue; otherwise bail.
- SingleValueInstruction *dummyInitVal;
- auto *SILG = getVariableOfStaticInitializer(InitF, dummyInitVal);
- if (!SILG || !SILG->isDefinition())
- return nullptr;
+ if (!InitF || !InitF->getName().startswith("globalinit_")
+ || InitializerCount[InitF] > 1)
+ return nullptr;
- return SILG;
- }
- return nullptr;
+ // If the globalinit_func is trivial, continue; otherwise bail.
+ SingleValueInstruction *dummyInitVal;
+ auto *SILG = getVariableOfStaticInitializer(InitF, dummyInitVal);
+ if (!SILG || !SILG->isDefinition())
+ return nullptr;
+
+ return SILG;
}
static bool canBeChangedExternally(SILGlobalVariable *SILG) {
-
// Don't assume anything about globals which are imported from other modules.
if (isAvailableExternally(SILG->getLinkage()))
return true;
@@ -880,16 +928,14 @@
if (!SILG->getDecl())
return;
- SILValue V = GAI;
- for (auto Use : getNonDebugUses(V)) {
-
- if (auto *SI = dyn_cast<StoreInst>(Use->getUser())) {
+ for (auto *Op : getNonDebugUses(GAI)) {
+ if (auto *SI = dyn_cast<StoreInst>(Op->getUser())) {
if (SI->getDest() == GAI)
collectGlobalStore(SI, SILG);
continue;
}
- if (auto *Load = getValidLoad(Use->getUser(), GAI)) {
+ if (auto *Load = getValidLoad(Op->getUser(), GAI)) {
collectGlobalLoad(Load, SILG);
continue;
}
@@ -901,10 +947,9 @@
}
}
-/// Optimize access to the global variable, which is known
-/// to have a constant value. Replace all loads from the
-/// global address by invocations of a getter that returns
-/// the value of this variable.
+// Optimize access to the global variable, which is known to have a constant
+// value. Replace all loads from the global address by invocations of a getter
+// that returns the value of this variable.
void SILGlobalOpt::optimizeGlobalAccess(SILGlobalVariable *SILG,
StoreInst *SI) {
DEBUG(llvm::dbgs() << "GlobalOpt: use static initializer for " <<
@@ -931,7 +976,7 @@
// inside each function that loads from the global. This
// invocation should happen at the common dominator of all
// loads inside this function.
- for (auto *Load: GlobalLoadMap[SILG]) {
+ for (auto *Load : GlobalLoadMap[SILG]) {
SILBuilderWithScope B(Load);
auto *GetterRef = B.createFunctionRef(Load->getLoc(), GetterF);
auto *Value = B.createApply(Load->getLoc(), GetterRef, {}, false);
@@ -953,30 +998,26 @@
ColdBlockInfo ColdBlocks(DA);
for (auto &BB : F) {
bool IsCold = ColdBlocks.isCold(&BB);
- auto Iter = BB.begin();
-
- // We can't remove instructions willy-nilly as we iterate because
- // that might cause a pointer to the next instruction to become
- // garbage, causing iterator invalidations (and crashes).
- // Instead, we collect in a list the instructions we want to remove
- // and erase the BB they belong to at the end of the loop, once we're
- // sure it's safe to do so.
- llvm::SmallVector<SILInstruction *, 4> ToRemove;
-
- while (Iter != BB.end()) {
- SILInstruction *I = &*Iter;
- Iter++;
- if (auto *BI = dyn_cast<BuiltinInst>(I)) {
+ for (auto &I : BB) {
+ if (auto *BI = dyn_cast<BuiltinInst>(&I)) {
collectOnceCall(BI);
- } else if (auto *AI = dyn_cast<ApplyInst>(I)) {
- if (!IsCold)
- collectGlobalInitCall(AI);
- } else if (auto *GAI = dyn_cast<GlobalAddrInst>(I)) {
- collectGlobalAccess(GAI);
+ continue;
}
+
+ if (auto *AI = dyn_cast<ApplyInst>(&I)) {
+ if (!IsCold) {
+ collectGlobalInitCall(AI);
+ }
+ continue;
+ }
+
+ auto *GAI = dyn_cast<GlobalAddrInst>(&I);
+ if (!GAI) {
+ continue;
+ }
+
+ collectGlobalAccess(GAI);
}
- for (auto *I : ToRemove)
- I->eraseFromParent();
}
}
@@ -994,17 +1035,21 @@
return HasChanged;
}
+//===----------------------------------------------------------------------===//
+// Top Level Entry Point
+//===----------------------------------------------------------------------===//
+
namespace {
-class SILGlobalOptPass : public SILModuleTransform
-{
+
+class SILGlobalOptPass : public SILModuleTransform {
void run() override {
- DominanceAnalysis *DA = PM->getAnalysis<DominanceAnalysis>();
+ auto *DA = PM->getAnalysis<DominanceAnalysis>();
if (SILGlobalOpt(getModule(), DA).run()) {
invalidateAll();
}
}
-
};
+
} // end anonymous namespace
SILTransform *swift::createGlobalOpt() {
diff --git a/lib/SILOptimizer/Transforms/SILMem2Reg.cpp b/lib/SILOptimizer/Transforms/SILMem2Reg.cpp
index 0229d8d..846dc04 100644
--- a/lib/SILOptimizer/Transforms/SILMem2Reg.cpp
+++ b/lib/SILOptimizer/Transforms/SILMem2Reg.cpp
@@ -277,6 +277,8 @@
/// Promote a DebugValueAddr to a DebugValue of the given value.
static void
promoteDebugValueAddr(DebugValueAddrInst *DVAI, SILValue Value, SILBuilder &B) {
+ assert(DVAI->getOperand()->getType().isLoadable(DVAI->getModule()) &&
+ "Unexpected promotion of address-only type!");
assert(Value && "Expected valid value");
B.setInsertionPoint(DVAI);
B.setCurrentDebugScope(DVAI->getDebugScope());
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
index 55d3ad3..ee55a7d 100644
--- a/lib/Sema/CSApply.cpp
+++ b/lib/Sema/CSApply.cpp
@@ -4655,6 +4655,8 @@
auto hashable =
cs.getASTContext().getProtocol(KnownProtocolKind::Hashable);
+ auto equatable =
+ cs.getASTContext().getProtocol(KnownProtocolKind::Equatable);
for (auto indexType : indexTypes) {
auto conformance =
cs.TC.conformsToProtocol(indexType.getType(), hashable,
@@ -4669,6 +4671,17 @@
continue;
}
hashables.push_back(*conformance);
+
+ // FIXME: Hashable implies Equatable, but we need to make sure the
+ // Equatable conformance is forced into existence during type checking
+ // so that it's available for SILGen.
+ auto eqConformance =
+ cs.TC.conformsToProtocol(indexType.getType(), equatable,
+ cs.DC,
+ (ConformanceCheckFlags::Used|
+ ConformanceCheckFlags::InExpression));
+ assert(eqConformance.hasValue());
+ (void)eqConformance;
}
if (allIndexesHashable) {
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
index 264c08b..4153853 100644
--- a/lib/Sema/CSDiag.cpp
+++ b/lib/Sema/CSDiag.cpp
@@ -2111,13 +2111,17 @@
// Walk the base expression to ensure we erase any existentials within
// it.
base = base->walk(*this);
-
- bool inserted = OpenExistentials.insert({archetypeVal, base}).second;
- assert(inserted && "OpaqueValue appears multiple times?");
- (void)inserted;
+
+ registerOpaqueValue(archetypeVal, base);
return { true, OOE->getSubExpr() };
}
-
+
+ if (auto *MTEE = dyn_cast<MakeTemporarilyEscapableExpr>(expr)) {
+ registerOpaqueValue(MTEE->getOpaqueValue(),
+ MTEE->getNonescapingClosureValue());
+ return {true, MTEE->getSubExpr()};
+ }
+
if (auto OVE = dyn_cast<OpaqueValueExpr>(expr)) {
auto value = OpenExistentials.find(OVE);
assert(value != OpenExistentials.end() &&
@@ -2166,6 +2170,12 @@
std::pair<bool, Stmt *> walkToStmtPre(Stmt *S) override {
return { false, S };
}
+
+ void registerOpaqueValue(OpaqueValueExpr *opaque, Expr *base) {
+ bool inserted = OpenExistentials.insert({opaque, base}).second;
+ assert(inserted && "OpaqueValue appears multiple times?");
+ (void)inserted;
+ }
};
expr = expr->walk(ExistentialEraser(CS));
diff --git a/lib/Sema/CSRanking.cpp b/lib/Sema/CSRanking.cpp
index 451f047..c28715a 100644
--- a/lib/Sema/CSRanking.cpp
+++ b/lib/Sema/CSRanking.cpp
@@ -384,6 +384,21 @@
return param.getType();
}
+// Is a particular parameter of a function or subscript declaration
+// declared to be an IUO?
+static bool paramIsIUO(Decl *decl, int paramNum) {
+ if (auto *fn = dyn_cast<AbstractFunctionDecl>(decl)) {
+ auto *paramList =
+ fn->getParameterList(fn->getDeclContext()->isTypeContext());
+ auto *param = paramList->get(paramNum);
+ return param->getAttrs().hasAttribute<ImplicitlyUnwrappedOptionalAttr>();
+ }
+
+ auto *subscript = cast<SubscriptDecl>(decl);
+ auto *index = subscript->getIndices()->get(paramNum);
+ return index->getAttrs().hasAttribute<ImplicitlyUnwrappedOptionalAttr>();
+}
+
/// \brief Determine whether the first declaration is as "specialized" as
/// the second declaration.
///
@@ -676,6 +691,17 @@
continue;
}
+ // Emulate behavior from when IUO was a type, where IUOs
+ // were considered subtypes of plain optionals, but not
+ // vice-versa. This wouldn't normally happen, but there are
+ // cases where we can rename imported APIs so that we have a
+ // name collision, and where the parameter type(s) are the
+ // same except for details of the kind of optional declared.
+ auto param1IsIUO = paramIsIUO(decl1, param1);
+ auto param2IsIUO = paramIsIUO(decl2, param2);
+ if (param2IsIUO && !param1IsIUO)
+ return false;
+
if (!maybeAddSubtypeConstraint(params1[param1], params2[param2]))
return false;
diff --git a/lib/Sema/CalleeCandidateInfo.cpp b/lib/Sema/CalleeCandidateInfo.cpp
index d1a0570..d8ad621 100644
--- a/lib/Sema/CalleeCandidateInfo.cpp
+++ b/lib/Sema/CalleeCandidateInfo.cpp
@@ -25,6 +25,36 @@
using namespace swift;
using namespace constraints;
+/// \brief Determine whether one type would be a valid substitution for an
+/// archetype.
+///
+/// \param type The potential type.
+///
+/// \param archetype The archetype for which type may (or may not) be
+/// substituted.
+///
+/// \param dc The context of the check.
+///
+/// \returns true if \c t1 is a valid substitution for \c t2.
+static bool isSubstitutableFor(Type type, ArchetypeType *archetype,
+ DeclContext *dc) {
+ if (archetype->requiresClass() && !type->satisfiesClassConstraint())
+ return false;
+
+ if (auto superclass = archetype->getSuperclass()) {
+ if (!superclass->isExactSuperclassOf(type))
+ return false;
+ }
+
+ for (auto proto : archetype->getConformsTo()) {
+ if (!dc->getParentModule()->lookupConformance(
+ type, proto))
+ return false;
+ }
+
+ return true;
+}
+
UncurriedCandidate::UncurriedCandidate(ValueDecl *decl, unsigned level)
: declOrExpr(decl), level(level), substituted(false) {
@@ -426,14 +456,14 @@
if (!archetype->isPrimary())
return { CC_ArgumentMismatch, {}};
- if (!CS.TC.isSubstitutableFor(substitution, archetype, CS.DC)) {
+ if (!isSubstitutableFor(substitution, archetype, CS.DC)) {
// If we have multiple non-substitutable types, this is just a mismatched mess.
if (!nonSubstitutableArchetype.isNull())
return { CC_ArgumentMismatch, {}};
if (auto argOptType = argType->getOptionalObjectType())
mismatchesAreNearMisses &=
- CS.TC.isSubstitutableFor(argOptType, archetype, CS.DC);
+ isSubstitutableFor(argOptType, archetype, CS.DC);
else
mismatchesAreNearMisses = false;
@@ -455,7 +485,7 @@
// type might be the one that we should be substituting for instead.
// Note that failureInfo is already set correctly for that case.
if (isNonSubstitutableArchetype && nonSubstitutableArgs == 1 &&
- CS.TC.isSubstitutableFor(substitution, archetype, CS.DC)) {
+ isSubstitutableFor(substitution, archetype, CS.DC)) {
mismatchesAreNearMisses = argumentMismatchIsNearMiss(existingSubstitution, substitution);
allGenericSubstitutions[archetype] = substitution;
} else {
@@ -959,7 +989,7 @@
// Check for optional near miss.
if (auto argOptType = substitution->getOptionalObjectType()) {
- if (CS.TC.isSubstitutableFor(argOptType, paramArchetype, CS.DC)) {
+ if (isSubstitutableFor(argOptType, paramArchetype, CS.DC)) {
CS.TC.diagnose(badArgExpr->getLoc(), diag::missing_unwrap_optional,
argType);
foundFailure = true;
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
index ddf04b2..50ceb08 100644
--- a/lib/Sema/MiscDiagnostics.cpp
+++ b/lib/Sema/MiscDiagnostics.cpp
@@ -3838,11 +3838,6 @@
continue;
}
- if (auto boundAliasTy = dyn_cast<BoundNameAliasType>(type.getPointer())) {
- type = boundAliasTy->getSinglyDesugaredType();
- continue;
- }
-
// Strip off lvalue/inout types.
Type newType = type->getWithoutSpecifierType();
if (newType.getPointer() != type.getPointer()) {
diff --git a/lib/Sema/NameBinding.cpp b/lib/Sema/NameBinding.cpp
index 19250bb..248ca97 100644
--- a/lib/Sema/NameBinding.cpp
+++ b/lib/Sema/NameBinding.cpp
@@ -18,6 +18,7 @@
#include "swift/AST/DiagnosticsSema.h"
#include "swift/AST/ModuleLoader.h"
#include "swift/AST/NameLookup.h"
+#include "swift/AST/SubstitutionMap.h"
#include "swift/Basic/Statistic.h"
#include "swift/ClangImporter/ClangModule.h"
#include "swift/Parse/Parser.h"
@@ -286,7 +287,8 @@
emittedDiag.emplace(diagnose(ID,
diag::imported_decl_is_wrong_kind_typealias,
typealias->getDescriptiveKind(),
- typealias->getDeclaredInterfaceType(),
+ NameAliasType::get(typealias, Type(), SubstitutionMap(),
+ typealias->getUnderlyingTypeLoc().getType()),
getImportKindString(ID->getImportKind())));
} else {
emittedDiag.emplace(diagnose(ID, diag::imported_decl_is_wrong_kind,
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
index fe32aa5..a654ec6 100644
--- a/lib/Sema/TypeCheckConstraints.cpp
+++ b/lib/Sema/TypeCheckConstraints.cpp
@@ -2816,25 +2816,6 @@
return (kind != CheckedCastKind::Unresolved);
}
-bool TypeChecker::isSubstitutableFor(Type type, ArchetypeType *archetype,
- DeclContext *dc) {
- if (archetype->requiresClass() && !type->satisfiesClassConstraint())
- return false;
-
- if (auto superclass = archetype->getSuperclass()) {
- if (!superclass->isExactSuperclassOf(type))
- return false;
- }
-
- for (auto proto : archetype->getConformsTo()) {
- if (!dc->getParentModule()->lookupConformance(
- type, proto))
- return false;
- }
-
- return true;
-}
-
Expr *TypeChecker::coerceToRValue(Expr *expr,
llvm::function_ref<Type(Expr *)> getType,
llvm::function_ref<void(Expr *, Type)> setType) {
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
index df3c75b..7b0f9cb 100644
--- a/lib/Sema/TypeCheckDecl.cpp
+++ b/lib/Sema/TypeCheckDecl.cpp
@@ -1323,10 +1323,9 @@
Action walkToTypePre(Type T) override {
ValueDecl *VD;
- if (auto *TAD = dyn_cast<NameAliasType>(T.getPointer()))
- VD = TAD->getDecl();
- else if (auto *BNAD = dyn_cast<BoundNameAliasType>(T.getPointer())) {
- if (CanonicalizeParentTypes)
+ if (auto *BNAD = dyn_cast<NameAliasType>(T.getPointer())) {
+ if (CanonicalizeParentTypes &&
+ BNAD->getDecl()->getUnderlyingTypeLoc().getType()->hasTypeParameter())
VD = nullptr;
else
VD = BNAD->getDecl();
@@ -1339,9 +1338,11 @@
if (!visitDecl(VD))
return Action::Stop;
- if (!CanonicalizeParentTypes)
- return Action::Continue;
-
+ if (!CanonicalizeParentTypes) {
+ return isa<NameAliasType>(T.getPointer()) ? Action::SkipChildren
+ : Action::Continue;
+ }
+
Type nominalParentTy;
if (auto nominalTy = dyn_cast<NominalType>(T.getPointer())) {
nominalParentTy = nominalTy->getParent();
@@ -1349,11 +1350,13 @@
nominalParentTy = genericTy->getParent();
for (auto genericArg : genericTy->getGenericArgs())
genericArg.walk(*this);
- } else if (auto boundNameAliasTy =
- dyn_cast<BoundNameAliasType>(T.getPointer())) {
+ } else if (auto NameAliasTy =
+ dyn_cast<NameAliasType>(T.getPointer())) {
// The parent type would have been lost previously, so look right through
// this type.
- Type(boundNameAliasTy->getSinglyDesugaredType()).walk(*this);
+ if (NameAliasTy->getDecl()->getUnderlyingTypeLoc().getType()
+ ->hasTypeParameter())
+ Type(NameAliasTy->getSinglyDesugaredType()).walk(*this);
} else {
return Action::Continue;
}
@@ -8197,46 +8200,137 @@
assert(D->hasAccess());
}
+bool swift::isPassThroughTypealias(TypeAliasDecl *typealias) {
+ // Pass-through only makes sense when the typealias refers to a nominal
+ // type.
+ Type underlyingType = typealias->getUnderlyingTypeLoc().getType();
+ auto nominal = underlyingType->getAnyNominal();
+ if (!nominal) return false;
+
+ // Check that the nominal type and the typealias are either both generic
+ // at this level or neither are.
+ if (nominal->isGeneric() != typealias->isGeneric())
+ return false;
+
+ // Make sure either both have generic signatures or neither do.
+ auto nominalSig = nominal->getGenericSignature();
+ auto typealiasSig = typealias->getGenericSignature();
+ if (static_cast<bool>(nominalSig) != static_cast<bool>(typealiasSig))
+ return false;
+
+ // If neither is generic, we're done: it's a pass-through alias.
+ if (!nominalSig) return true;
+
+ // Check that the type parameters are the same the whole way through.
+ auto nominalGenericParams = nominalSig->getGenericParams();
+ auto typealiasGenericParams = typealiasSig->getGenericParams();
+ if (nominalGenericParams.size() != typealiasGenericParams.size())
+ return false;
+ if (!std::equal(nominalGenericParams.begin(), nominalGenericParams.end(),
+ typealiasGenericParams.begin(),
+ [](GenericTypeParamType *gp1, GenericTypeParamType *gp2) {
+ return gp1->isEqual(gp2);
+ }))
+ return false;
+
+ // If neither is generic at this level, we have a pass-through typealias.
+ if (!typealias->isGeneric()) return true;
+
+ auto boundGenericType = underlyingType->getAs<BoundGenericType>();
+ if (!boundGenericType) return false;
+
+ // If our arguments line up with our innermost generic parameters, it's
+ // a passthrough typealias.
+ auto innermostGenericParams = typealiasSig->getInnermostGenericParams();
+ auto boundArgs = boundGenericType->getGenericArgs();
+ if (boundArgs.size() != innermostGenericParams.size())
+ return false;
+
+ return std::equal(boundArgs.begin(), boundArgs.end(),
+ innermostGenericParams.begin(),
+ [](Type arg, GenericTypeParamType *gp) {
+ return arg->isEqual(gp);
+ });
+}
+
/// Form the interface type of an extension from the raw type and the
/// extension's list of generic parameters.
-static Type formExtensionInterfaceType(Type type,
- GenericParamList *genericParams) {
+static Type formExtensionInterfaceType(TypeChecker &tc, ExtensionDecl *ext,
+ Type type,
+ GenericParamList *genericParams,
+ bool &mustInferRequirements) {
// Find the nominal type declaration and its parent type.
Type parentType;
- NominalTypeDecl *nominal;
+ GenericTypeDecl *genericDecl;
if (auto unbound = type->getAs<UnboundGenericType>()) {
parentType = unbound->getParent();
- nominal = cast<NominalTypeDecl>(unbound->getDecl());
+ genericDecl = unbound->getDecl();
} else {
if (type->is<ProtocolCompositionType>())
type = type->getCanonicalType();
auto nominalType = type->castTo<NominalType>();
parentType = nominalType->getParent();
- nominal = nominalType->getDecl();
+ genericDecl = nominalType->getDecl();
}
// Reconstruct the parent, if there is one.
if (parentType) {
// Build the nested extension type.
- auto parentGenericParams = nominal->getGenericParams()
+ auto parentGenericParams = genericDecl->getGenericParams()
? genericParams->getOuterParameters()
: genericParams;
- parentType = formExtensionInterfaceType(parentType, parentGenericParams);
+ parentType =
+ formExtensionInterfaceType(tc, ext, parentType, parentGenericParams,
+ mustInferRequirements);
}
- // If we don't have generic parameters at this level, just build the result.
- if (!nominal->getGenericParams() || isa<ProtocolDecl>(nominal)) {
- return NominalType::get(nominal, parentType,
- nominal->getASTContext());
+ // Find the nominal type.
+ auto nominal = dyn_cast<NominalTypeDecl>(genericDecl);
+ auto typealias = dyn_cast<TypeAliasDecl>(genericDecl);
+ if (!nominal) {
+ Type underlyingType = typealias->getUnderlyingTypeLoc().getType();
+ nominal = underlyingType->getNominalOrBoundGenericNominal();
}
- // Form the bound generic type with the type parameters provided.
+ // Form the result.
+ Type resultType;
SmallVector<Type, 2> genericArgs;
- for (auto gp : *genericParams) {
- genericArgs.push_back(gp->getDeclaredInterfaceType());
+ if (!nominal->isGeneric() || isa<ProtocolDecl>(nominal)) {
+ resultType = NominalType::get(nominal, parentType,
+ nominal->getASTContext());
+ } else {
+ // Form the bound generic type with the type parameters provided.
+ for (auto gp : *genericParams) {
+ genericArgs.push_back(gp->getDeclaredInterfaceType());
+ }
+
+ resultType = BoundGenericType::get(nominal, parentType, genericArgs);
}
- return BoundGenericType::get(nominal, parentType, genericArgs);
+ // If we have a typealias, try to form type sugar.
+ if (typealias && isPassThroughTypealias(typealias)) {
+ auto typealiasSig = typealias->getGenericSignature();
+ SubstitutionMap subMap;
+ if (typealiasSig) {
+ subMap = typealiasSig->getSubstitutionMap(
+ [](SubstitutableType *type) -> Type {
+ return Type(type);
+ },
+ [](CanType dependentType,
+ Type replacementType,
+ ProtocolType *protoType) {
+ auto proto = protoType->getDecl();
+ return ProtocolConformanceRef(proto);
+ });
+
+ mustInferRequirements = true;
+ }
+
+ resultType = NameAliasType::get(typealias, parentType, subMap,
+ resultType);
+ }
+
+ return resultType;
}
/// Visit the given generic parameter lists from the outermost to the innermost,
@@ -8258,7 +8352,10 @@
assert(!ext->getGenericEnvironment());
// Form the interface type of the extension.
- Type extInterfaceType = formExtensionInterfaceType(type, genericParams);
+ bool mustInferRequirements = false;
+ Type extInterfaceType =
+ formExtensionInterfaceType(tc, ext, type, genericParams,
+ mustInferRequirements);
// Prepare all of the generic parameter lists for generic signature
// validation.
@@ -8280,7 +8377,8 @@
auto *env = tc.checkGenericEnvironment(genericParams,
ext->getDeclContext(), nullptr,
/*allowConcreteGenericParams=*/true,
- ext, inferExtendedTypeReqs);
+ ext, inferExtendedTypeReqs,
+ mustInferRequirements);
// Validate the generic parameters for the last time, to splat down
// actual archetypes.
@@ -8319,7 +8417,14 @@
return;
// Validate the nominal type declaration being extended.
- auto nominal = extendedType->getAnyNominal();
+ NominalTypeDecl *nominal = extendedType->getAnyNominal();
+ if (!nominal) {
+ auto unbound = cast<UnboundGenericType>(extendedType.getPointer());
+ auto typealias = cast<TypeAliasDecl>(unbound->getDecl());
+ validateDecl(typealias);
+
+ nominal = typealias->getUnderlyingTypeLoc().getType()->getAnyNominal();
+ }
validateDecl(nominal);
if (nominal->getGenericParamsOfContext()) {
diff --git a/lib/Sema/TypeCheckExpr.cpp b/lib/Sema/TypeCheckExpr.cpp
index 2f5360b..727d401 100644
--- a/lib/Sema/TypeCheckExpr.cpp
+++ b/lib/Sema/TypeCheckExpr.cpp
@@ -658,10 +658,8 @@
// Strip off one level of sugar; we don't actually want to print
// the name of the typealias itself anywhere.
if (type && *type) {
- if (auto typeAlias = dyn_cast<NameAliasType>(type->getPointer()))
- *type = typeAlias->getSinglyDesugaredType();
- else if (auto boundTypeAlias =
- dyn_cast<BoundNameAliasType>(type->getPointer()))
+ if (auto boundTypeAlias =
+ dyn_cast<NameAliasType>(type->getPointer()))
*type = boundTypeAlias->getSinglyDesugaredType();
}
}
diff --git a/lib/Sema/TypeCheckGeneric.cpp b/lib/Sema/TypeCheckGeneric.cpp
index c435b9e..d620bc7 100644
--- a/lib/Sema/TypeCheckGeneric.cpp
+++ b/lib/Sema/TypeCheckGeneric.cpp
@@ -1147,13 +1147,14 @@
bool allowConcreteGenericParams,
ExtensionDecl *ext,
llvm::function_ref<void(GenericSignatureBuilder &)>
- inferRequirements) {
+ inferRequirements,
+ bool mustInferRequirements) {
assert(genericParams && "Missing generic parameters?");
bool recursivelyVisitGenericParams =
genericParams->getOuterParameters() && !parentSig;
GenericSignature *sig;
- if (!ext || ext->getTrailingWhereClause() ||
+ if (!ext || mustInferRequirements || ext->getTrailingWhereClause() ||
getExtendedTypeGenericDepth(ext) != genericParams->getDepth()) {
// Collect the generic parameters.
SmallVector<GenericTypeParamType *, 4> allGenericParams;
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
index 11d6748..059b8b4 100644
--- a/lib/Sema/TypeCheckType.cpp
+++ b/lib/Sema/TypeCheckType.cpp
@@ -611,14 +611,13 @@
SubstFlags::UseErrorType);
// Form a sugared typealias reference.
- if (typealias) {
+ Type parentType = unboundType->getParent();
+ if (typealias && (!parentType || !parentType->isAnyExistentialType())) {
auto genericSig = typealias->getGenericSignature();
auto subMap = genericSig->getSubstitutionMap(QueryTypeSubstitutionMap{subs},
LookUpConformance(*this, dc));
- if (!subMap.empty()) {
- resultType = BoundNameAliasType::get(typealias, unboundType->getParent(),
- subMap, resultType);
- }
+ resultType = NameAliasType::get(typealias, parentType,
+ subMap, resultType);
}
if (isa<NominalTypeDecl>(decl) && resultType) {
@@ -1042,13 +1041,12 @@
SmallVector<ValueDecl *, 4> decls;
if (DC->lookupQualified(nominal->getDeclaredInterfaceType(),
comp->getIdentifier(),
- NL_QualifiedDefault|NL_ProtocolMembers,
+ NL_OnlyTypes|NL_QualifiedDefault|NL_ProtocolMembers,
&TC,
decls)) {
for (const auto decl : decls) {
// FIXME: Better ambiguity handling.
- auto typeDecl = dyn_cast<TypeDecl>(decl);
- if (!typeDecl) continue;
+ auto typeDecl = cast<TypeDecl>(decl);
if (!isa<ProtocolDecl>(typeDecl->getDeclContext())) continue;
@@ -3163,8 +3161,10 @@
baseTy = baseTy->getSuperclassForDecl(ownerClass);
}
- if (baseTy->is<ModuleType>())
+ if (baseTy->is<ModuleType>()) {
baseTy = Type();
+ sugaredBaseTy = Type();
+ }
// The declared interface type for a generic type will have the type
// arguments; strip them off.
@@ -3198,18 +3198,30 @@
}
}
- auto memberType = member->getDeclaredInterfaceType();
- if (!baseTy || !memberType->hasTypeParameter())
- return memberType;
+ Type resultType;
+ auto memberType = aliasDecl ? aliasDecl->getUnderlyingTypeLoc().getType()
+ : member->getDeclaredInterfaceType();
+ SubstitutionMap subs;
+ if (baseTy) {
+ // Cope with the presence of unbound generic types, which are ill-formed
+ // at this point but break the invariants of getContextSubstitutionMap().
+ if (baseTy->hasUnboundGenericType()) {
+ if (memberType->hasTypeParameter())
+ return ErrorType::get(memberType);
- auto subs = baseTy->getContextSubstitutionMap(
- module, member->getDeclContext());
- Type resultType = memberType.subst(subs, SubstFlags::UseErrorType);
+ return memberType;
+ }
+
+ subs = baseTy->getContextSubstitutionMap(module, member->getDeclContext());
+ resultType = memberType.subst(subs, SubstFlags::UseErrorType);
+ } else {
+ resultType = memberType;
+ }
// If we're referring to a typealias within a generic context, build
// a sugared alias type.
- if (aliasDecl && aliasDecl->getGenericSignature()) {
- resultType = BoundNameAliasType::get(aliasDecl, sugaredBaseTy, subs,
+ if (aliasDecl && (!sugaredBaseTy || !sugaredBaseTy->isAnyExistentialType())) {
+ resultType = NameAliasType::get(aliasDecl, sugaredBaseTy, subs,
resultType);
}
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
index 215d3c0..70da39f 100644
--- a/lib/Sema/TypeChecker.cpp
+++ b/lib/Sema/TypeChecker.cpp
@@ -323,7 +323,8 @@
auto extendedNominal = aliasDecl->getDeclaredInterfaceType()->getAnyNominal();
if (extendedNominal) {
extendedType = extendedNominal->getDeclaredType();
- ED->getExtendedTypeLoc().setType(extendedType);
+ if (!isPassThroughTypealias(aliasDecl))
+ ED->getExtendedTypeLoc().setType(extendedType);
}
}
}
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
index 74a3d38..0e5d12f 100644
--- a/lib/Sema/TypeChecker.h
+++ b/lib/Sema/TypeChecker.h
@@ -1277,19 +1277,6 @@
DeclContext *dc,
bool *unwrappedIUO = nullptr);
- /// \brief Determine whether one type would be a valid substitution for an
- /// archetype.
- ///
- /// \param type The potential type.
- ///
- /// \param archetype The archetype for which type may (or may not) be
- /// substituted.
- ///
- /// \param dc The context of the check.
- ///
- /// \returns true if \c t1 is a valid substitution for \c t2.
- bool isSubstitutableFor(Type type, ArchetypeType *archetype, DeclContext *dc);
-
/// If the inputs to an apply expression use a consistent "sugar" type
/// (that is, a typealias or shorthand syntax) equivalent to the result type
/// of the function, set the result type of the expression to that sugar type.
@@ -1419,7 +1406,8 @@
bool allowConcreteGenericParams,
ExtensionDecl *ext,
llvm::function_ref<void(GenericSignatureBuilder &)>
- inferRequirements);
+ inferRequirements,
+ bool mustInferRequirements);
/// Construct a new generic environment for the given declaration context.
///
@@ -1439,7 +1427,8 @@
ExtensionDecl *ext) {
return checkGenericEnvironment(genericParams, dc, outerSignature,
allowConcreteGenericParams, ext,
- [&](GenericSignatureBuilder &) { });
+ [&](GenericSignatureBuilder &) { },
+ /*mustInferRequirements=*/false);
}
/// Validate the signature of a generic type.
@@ -2544,7 +2533,27 @@
bool isAcceptableDynamicMemberLookupSubscript(SubscriptDecl *decl,
DeclContext *DC,
TypeChecker &TC);
-
+
+/// Determine whether this is a "pass-through" typealias, which has the
+/// same type parameters as the nominal type it references and specializes
+/// the underlying nominal type with exactly those type parameters.
+/// For example, the following typealias \c GX is a pass-through typealias:
+///
+/// \code
+/// struct X<T, U> { }
+/// typealias GX<A, B> = X<A, B>
+/// \endcode
+///
+/// whereas \c GX2 and \c GX3 are not pass-through because \c GX2 has
+/// different type parameters and \c GX3 doesn't pass its type parameters
+/// directly through.
+///
+/// \code
+/// typealias GX2<A> = X<A, A>
+/// typealias GX3<A, B> = X<B, A>
+/// \endcode
+bool isPassThroughTypealias(TypeAliasDecl *typealias);
+
} // end namespace swift
#endif
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
index 0448029..6fea07e 100644
--- a/lib/Serialization/Deserialization.cpp
+++ b/lib/Serialization/Deserialization.cpp
@@ -4145,11 +4145,11 @@
s->getFrontendCounters().NumTypesDeserialized++;
switch (recordID) {
- case decls_block::NAME_ALIAS_TYPE: {
+ case decls_block::BUILTIN_ALIAS_TYPE: {
DeclID underlyingID;
TypeID canonicalTypeID;
- decls_block::NameAliasTypeLayout::readRecord(scratch, underlyingID,
- canonicalTypeID);
+ decls_block::BuiltinAliasTypeLayout::readRecord(scratch, underlyingID,
+ canonicalTypeID);
auto aliasOrError = getDeclChecked(underlyingID);
if (!aliasOrError)
return aliasOrError.takeError();
@@ -4180,20 +4180,38 @@
break;
}
- case decls_block::BOUND_NAME_ALIAS_TYPE: {
+ case decls_block::NAME_ALIAS_TYPE: {
DeclID typealiasID;
TypeID parentTypeID;
TypeID underlyingTypeID;
- decls_block::BoundNameAliasTypeLayout::readRecord(scratch, typealiasID,
+ decls_block::NameAliasTypeLayout::readRecord(scratch, typealiasID,
parentTypeID,
underlyingTypeID);
auto aliasOrError = getDeclChecked(typealiasID);
if (!aliasOrError)
return aliasOrError.takeError();
- auto alias = cast<TypeAliasDecl>(aliasOrError.get());
+ auto alias = dyn_cast<TypeAliasDecl>(aliasOrError.get());
+
+ Type underlyingType;
+ if (ctx.LangOpts.EnableDeserializationRecovery) {
+ Expected<Type> expectedType = getTypeChecked(underlyingTypeID);
+ if (!expectedType)
+ return expectedType.takeError();
+ if (expectedType.get()) {
+ if (!alias ||
+ !alias->getDeclaredInterfaceType()->isEqual(expectedType.get())) {
+ // Fall back to the canonical type.
+ typeOrOffset = expectedType.get()->getCanonicalType();
+ break;
+ }
+ }
+
+ underlyingType = expectedType.get();
+ } else {
+ underlyingType = getType(underlyingTypeID);
+ }
Type parentType = getType(parentTypeID);
- Type underlyingType = getType(underlyingTypeID);
// Read the substitutions.
SubstitutionMap subMap;
@@ -4207,7 +4225,14 @@
subMap = genericSig->getSubstitutionMap(substitutions);
}
- typeOrOffset = BoundNameAliasType::get(alias, parentType, subMap,
+ // Look through compatibility aliases that are now unavailable.
+ if (alias->getAttrs().isUnavailable(ctx) &&
+ alias->isCompatibilityAlias()) {
+ typeOrOffset = alias->getUnderlyingTypeLoc().getType();
+ break;
+ }
+
+ typeOrOffset = NameAliasType::get(alias, parentType, subMap,
underlyingType);
break;
}
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
index 269b9a4..fa67088 100644
--- a/lib/Serialization/Serialization.cpp
+++ b/lib/Serialization/Serialization.cpp
@@ -36,6 +36,7 @@
#include "swift/ClangImporter/ClangImporter.h"
#include "swift/ClangImporter/ClangModule.h"
#include "swift/Serialization/SerializationOptions.h"
+#include "swift/Strings.h"
// FIXME: We're just using CompilerInstance::createOutputFile.
// This API should be sunk down to LLVM.
@@ -3556,7 +3557,7 @@
llvm::SmallString<32> FullName;
llvm::raw_svector_ostream OS(FullName);
T->print(OS);
- assert(FullName.startswith("Builtin."));
+ assert(FullName.startswith(BUILTIN_TYPE_NAME_PREFIX));
StringRef TypeName = FullName.substr(8);
SmallVector<ValueDecl*, 4> CurModuleResults;
@@ -3596,42 +3597,30 @@
TypeAliasDecl *typeAlias =
findTypeAliasForBuiltin(M->getASTContext(), ty);
- unsigned abbrCode = DeclTypeAbbrCodes[NameAliasTypeLayout::Code];
- NameAliasTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
- addDeclRef(typeAlias,
- /*forceSerialization*/false,
- /*allowTypeAliasXRef*/true),
- TypeID());
+ unsigned abbrCode = DeclTypeAbbrCodes[BuiltinAliasTypeLayout::Code];
+ BuiltinAliasTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
+ addDeclRef(typeAlias,
+ /*forceSerialization*/false,
+ /*allowTypeAliasXRef*/true),
+ TypeID());
break;
}
case TypeKind::NameAlias: {
- auto nameAlias = cast<NameAliasType>(ty.getPointer());
- const TypeAliasDecl *typeAlias = nameAlias->getDecl();
+ auto alias = cast<NameAliasType>(ty.getPointer());
+ const TypeAliasDecl *typeAlias = alias->getDecl();
unsigned abbrCode = DeclTypeAbbrCodes[NameAliasTypeLayout::Code];
- NameAliasTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
- addDeclRef(typeAlias,
- /*forceSerialization*/false,
- /*allowTypeAliasXRef*/true),
- addTypeRef(ty->getCanonicalType()));
- break;
- }
- case TypeKind::BoundNameAlias: {
- auto boundAlias = cast<BoundNameAliasType>(ty.getPointer());
- const TypeAliasDecl *typeAlias = boundAlias->getDecl();
-
- unsigned abbrCode = DeclTypeAbbrCodes[BoundNameAliasTypeLayout::Code];
- BoundNameAliasTypeLayout::emitRecord(
+ NameAliasTypeLayout::emitRecord(
Out, ScratchRecord, abbrCode,
addDeclRef(typeAlias,
/*forceSerialization*/false,
/*allowTypeAliasXRef*/true),
- addTypeRef(boundAlias->getParent()),
- addTypeRef(boundAlias->getSinglyDesugaredType()));
+ addTypeRef(alias->getParent()),
+ addTypeRef(alias->getSinglyDesugaredType()));
// Write the set of substitutions.
SmallVector<Substitution, 4> flatSubs;
if (auto genericSig = typeAlias->getGenericSignature())
- genericSig->getSubstitutions(boundAlias->getSubstitutionMap(), flatSubs);
+ genericSig->getSubstitutions(alias->getSubstitutionMap(), flatSubs);
writeSubstitutions(flatSubs, DeclTypeAbbrCodes);
break;
}
@@ -3988,8 +3977,8 @@
void Serializer::writeAllDeclsAndTypes() {
BCBlockRAII restoreBlock(Out, DECLS_AND_TYPES_BLOCK_ID, 8);
using namespace decls_block;
+ registerDeclTypeAbbr<BuiltinAliasTypeLayout>();
registerDeclTypeAbbr<NameAliasTypeLayout>();
- registerDeclTypeAbbr<BoundNameAliasTypeLayout>();
registerDeclTypeAbbr<GenericTypeParamDeclLayout>();
registerDeclTypeAbbr<AssociatedTypeDeclLayout>();
registerDeclTypeAbbr<NominalTypeLayout>();
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
index 5414725..c4f2eeb 100644
--- a/stdlib/public/core/CMakeLists.txt
+++ b/stdlib/public/core/CMakeLists.txt
@@ -48,7 +48,6 @@
CTypes.swift
DebuggerSupport.swift
Dictionary.swift
- DoubleWidth.swift.gyb
DropWhile.swift
Dump.swift
EmptyCollection.swift
diff --git a/stdlib/public/core/GroupInfo.json b/stdlib/public/core/GroupInfo.json
index 735a3ae..041f5b3 100644
--- a/stdlib/public/core/GroupInfo.json
+++ b/stdlib/public/core/GroupInfo.json
@@ -134,7 +134,6 @@
"BuiltinMath.swift",
{
"Integers": [
- "DoubleWidth.swift",
"Integers.swift",
"IntegerParsing.swift"],
"Floating": [
diff --git a/stdlib/public/core/Integers.swift.gyb b/stdlib/public/core/Integers.swift.gyb
index 683d7ca..94489ad 100644
--- a/stdlib/public/core/Integers.swift.gyb
+++ b/stdlib/public/core/Integers.swift.gyb
@@ -3552,23 +3552,11 @@
) -> (quotient: ${Self}, remainder: ${Self}) {
// FIXME(integers): tests
% # 128-bit types are not provided by the 32-bit LLVM
-% #if word_bits == 32 and bits == 64:
+% if word_bits == 32 and bits == 64:
% # FIXME(integers): uncomment the above after using the right conditional
% # compilation block to exclude 64-bit Windows, which does not support
% # 128-bit operations
-% if bits == 64:
-% HalfWidth = 'Int32' if signed else 'UInt32'
- let lhsHigh =
- unsafeBitCast(dividend.high, to: DoubleWidth<${HalfWidth}>.self)
- let lhsLow = unsafeBitCast(dividend.low, to: DoubleWidth<UInt32>.self)
- let rhs_ = unsafeBitCast(self, to: DoubleWidth<${HalfWidth}>.self)
-
- let (quotient_, remainder_) = rhs_.dividingFullWidth((lhsHigh, lhsLow))
-
- let quotient = unsafeBitCast(quotient_, to: ${Self}.self)
- let remainder = unsafeBitCast(remainder_, to: ${Self}.self)
-
- return (quotient: quotient, remainder: remainder)
+ fatalError("Operation is not supported")
% else:
// FIXME(integers): handle division by zero and overflows
_precondition(self != 0, "Division by zero")
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
index 6a034c1..076c62a 100644
--- a/stdlib/public/runtime/Metadata.cpp
+++ b/stdlib/public/runtime/Metadata.cpp
@@ -1845,10 +1845,11 @@
/// Initialize the field offset vector for a dependent-layout class, using the
/// "Universal" layout strategy.
void
-swift::swift_initClassMetadata_UniversalStrategy(ClassMetadata *self,
- size_t numFields,
- const TypeLayout * const *fieldTypes,
- size_t *fieldOffsets) {
+swift::swift_initClassMetadata(ClassMetadata *self,
+ ClassLayoutFlags layoutFlags,
+ size_t numFields,
+ const TypeLayout * const *fieldTypes,
+ size_t *fieldOffsets) {
_swift_initializeSuperclass(self);
// Start layout by appending to a standard heap object header.
diff --git a/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/APINotesFrameworkTest.apinotes b/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/APINotesFrameworkTest.apinotes
index af8b3b3..6b5e2ca 100644
--- a/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/APINotesFrameworkTest.apinotes
+++ b/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/APINotesFrameworkTest.apinotes
@@ -259,7 +259,7 @@
SwiftName: multiVersionedGlobal45Notes_5
- Name: multiVersionedGlobal45Both
SwiftName: multiVersionedGlobal45Both_5
- - Version: 4 # Versions are deliberately ordered as "3, 5, 4" to catch bugs.
+ - Version: 4 # Versions are deliberately ordered as "3, 5, 4.2, 4" to catch bugs.
Globals:
- Name: multiVersionedGlobal34
SwiftName: multiVersionedGlobal34_4
@@ -293,3 +293,39 @@
SwiftName: multiVersionedGlobal45Notes_4
- Name: multiVersionedGlobal45Both
SwiftName: multiVersionedGlobal45Both_4
+ - Version: 4.2
+ Globals:
+ - Name: multiVersionedGlobal34
+ SwiftName: multiVersionedGlobal34_4_2
+ - Name: multiVersionedGlobal34Header
+ SwiftName: multiVersionedGlobal34Header_4_2
+ - Name: multiVersionedGlobal34Notes
+ SwiftName: multiVersionedGlobal34Notes_4_2
+ - Name: multiVersionedGlobal34Both
+ SwiftName: multiVersionedGlobal34Both_4_2
+ - Name: multiVersionedGlobal345
+ SwiftName: multiVersionedGlobal345_4_2
+ - Name: multiVersionedGlobal345Header
+ SwiftName: multiVersionedGlobal345Header_4_2
+ - Name: multiVersionedGlobal345Notes
+ SwiftName: multiVersionedGlobal345Notes_4_2
+ - Name: multiVersionedGlobal345Both
+ SwiftName: multiVersionedGlobal345Both_4_2
+ - Name: multiVersionedGlobal4
+ SwiftName: multiVersionedGlobal4_4_2
+ - Name: multiVersionedGlobal4Header
+ SwiftName: multiVersionedGlobal4Header_4_2
+ - Name: multiVersionedGlobal4Notes
+ SwiftName: multiVersionedGlobal4Notes_4_2
+ - Name: multiVersionedGlobal4Both
+ SwiftName: multiVersionedGlobal4Both_4_2
+ - Name: multiVersionedGlobal45
+ SwiftName: multiVersionedGlobal45_4_2
+ - Name: multiVersionedGlobal45Header
+ SwiftName: multiVersionedGlobal45Header_4_2
+ - Name: multiVersionedGlobal45Notes
+ SwiftName: multiVersionedGlobal45Notes_4_2
+ - Name: multiVersionedGlobal45Both
+ SwiftName: multiVersionedGlobal45Both_4_2
+ - Name: multiVersionedGlobal34_4_2
+ SwiftName: multiVersionedGlobal34_4_2_not_5
diff --git a/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/Globals.h b/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/Globals.h
index 059ecd7..e719726 100644
--- a/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/Globals.h
+++ b/test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/Globals.h
@@ -20,4 +20,6 @@
int multiVersionedGlobal345Header __attribute__((swift_name("multiVersionedGlobal345Header_NEW")));
int multiVersionedGlobal345Both __attribute__((swift_name("multiVersionedGlobal345Both_OLD")));
+int multiVersionedGlobal34_4_2;
+
#pragma clang assume_nonnull end
diff --git a/test/APINotes/versioned-multi.swift b/test/APINotes/versioned-multi.swift
index d479c3c..07bb138 100644
--- a/test/APINotes/versioned-multi.swift
+++ b/test/APINotes/versioned-multi.swift
@@ -4,6 +4,8 @@
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 4 | %FileCheck -check-prefix=CHECK-SWIFT-4 %s
+// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 4.2 | %FileCheck -check-prefix=CHECK-SWIFT-4-2 %s
+
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 5 | %FileCheck -check-prefix=CHECK-SWIFT-5 %s
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4_4")
@@ -101,6 +103,9 @@
// CHECK-SWIFT-3: var multiVersionedGlobal345Both_4: Int32
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Both_3")
// CHECK-SWIFT-3: var multiVersionedGlobal345Both_5: Int32
+// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_4_2_not_5")
+// CHECK-SWIFT-3: var multiVersionedGlobal34_4_2: Int32
+// CHECK-SWIFT-3: var multiVersionedGlobal34_4_2_not_5: Int32
// CHECK-SWIFT-4: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4_4")
@@ -198,6 +203,108 @@
// CHECK-SWIFT-4: var multiVersionedGlobal345Both_4: Int32
// CHECK-SWIFT-4: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Both_4")
// CHECK-SWIFT-4: var multiVersionedGlobal345Both_5: Int32
+// CHECK-SWIFT-4: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_4_2_not_5")
+// CHECK-SWIFT-4: var multiVersionedGlobal34_4_2: Int32
+// CHECK-SWIFT-4: var multiVersionedGlobal34_4_2_not_5: Int32
+
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Notes: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Notes_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Notes_NEW: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Header: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Header_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Header_NEW: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Both: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Both_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal4Both_NEW: Int32
+
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal34_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Notes: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal34Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Notes_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Notes_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Notes_NEW: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Header: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal34Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Header_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Header_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Header_NEW: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Both: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal34Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Both_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Both_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34Both_NEW: Int32
+
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Notes: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Notes_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Notes_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Header: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Header_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Header_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Both: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Both_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal45Both_5: Int32
+
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal345_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Notes: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal345Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Notes_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Notes_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Notes_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Notes_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Header: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal345Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Header_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Header_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Header_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Header_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Both: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 4, renamed: "multiVersionedGlobal345Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Both_3: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Both_4: Int32
+// CHECK-SWIFT-4-2: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Both_4_2")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal345Both_5: Int32
+// CHECK-SWIFT-4-2: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_4_2_not_5")
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34_4_2: Int32
+// CHECK-SWIFT-4-2: var multiVersionedGlobal34_4_2_not_5: Int32
// CHECK-SWIFT-5: var multiVersionedGlobal4: Int32
@@ -295,3 +402,5 @@
// CHECK-SWIFT-5: @available(swift, obsoleted: 5, renamed: "multiVersionedGlobal345Both_5")
// CHECK-SWIFT-5: var multiVersionedGlobal345Both_4: Int32
// CHECK-SWIFT-5: var multiVersionedGlobal345Both_5: Int32
+// CHECK-SWIFT-5: @available(swift, obsoleted: 5, renamed: "multiVersionedGlobal34_4_2")
+// CHECK-SWIFT-5: var multiVersionedGlobal34_4_2_not_5: Int32
diff --git a/test/Compatibility/stdlib_generic_typealiases.swift b/test/Compatibility/stdlib_generic_typealiases.swift
new file mode 100644
index 0000000..4a5d6ec
--- /dev/null
+++ b/test/Compatibility/stdlib_generic_typealiases.swift
@@ -0,0 +1,18 @@
+// RUN: %target-typecheck-verify-swift
+
+struct RequiresComparable<T: Comparable> { }
+
+extension CountableRange { // expected-warning{{'CountableRange' is deprecated: renamed to 'Range'}}
+ // expected-note@-1{{use 'Range' instead}}{{11-25=Range}}
+ func testComparable() {
+ _ = RequiresComparable<Bound>()
+ }
+}
+
+struct RequiresHashable<T: Hashable> { }
+
+extension DictionaryIndex {
+ func testHashable() {
+ _ = RequiresHashable<Key>()
+ }
+}
diff --git a/test/Constraints/Inputs/disambiguate_iuo_param.h b/test/Constraints/Inputs/disambiguate_iuo_param.h
new file mode 100644
index 0000000..3048018
--- /dev/null
+++ b/test/Constraints/Inputs/disambiguate_iuo_param.h
@@ -0,0 +1,9 @@
+@import Foundation;
+
+@interface NSObject (NSMyTest)
+- (BOOL)isEqualTo:(nullable id)object;
+@end
+
+@interface Obj : NSObject
+- (BOOL)isEqualToObject:(id)value;
+@end
diff --git a/test/Constraints/diagnostics_swift4.swift b/test/Constraints/diagnostics_swift4.swift
index 9571efc..735ff9d 100644
--- a/test/Constraints/diagnostics_swift4.swift
+++ b/test/Constraints/diagnostics_swift4.swift
@@ -54,4 +54,5 @@
infix operator +=+ : AdditionPrecedence
func +=+(_ lhs: Int, _ rhs: Int) -> Bool { return lhs == rhs }
func +=+<T: BinaryInteger>(_ lhs: T, _ rhs: Int) -> Bool { return lhs == rhs }
-let _ = DoubleWidth<Int>(Int.min) - 1 +=+ Int.min // Ok
+// FIXME: DoubleWidth is no longer part of the standard library
+// let _ = DoubleWidth<Int>(Int.min) - 1 +=+ Int.min // Ok
diff --git a/test/Constraints/disambiguate_iuo_param.swift b/test/Constraints/disambiguate_iuo_param.swift
new file mode 100644
index 0000000..85c43f2
--- /dev/null
+++ b/test/Constraints/disambiguate_iuo_param.swift
@@ -0,0 +1,11 @@
+// RUN: %empty-directory(%t)
+// RUN: %build-clang-importer-objc-overlays
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -import-objc-header %S/Inputs/disambiguate_iuo_param.h %s -emit-ir | %FileCheck %s
+// -module-name objc_ir -I %S/Inputs/custom-modules -emit-ir -g -o - -primary-file %s | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+// CHECK: define {{.*}} @main
+// CHECK: load {{.*}}, {{.*}}@"\01L_selector(isEqualToObject:)"
+let c = Obj()
+_ = c.isEqual(to: c)
diff --git a/test/DebugInfo/DumpDeclFromMangledName.swift b/test/DebugInfo/DumpDeclFromMangledName.swift
index 154afd3..d1ba47d 100644
--- a/test/DebugInfo/DumpDeclFromMangledName.swift
+++ b/test/DebugInfo/DumpDeclFromMangledName.swift
@@ -7,7 +7,7 @@
// RUN: sed -ne '/--->/s/^.*---> *//p' < %S/Inputs/decl-reconstr-names.txt > %t.check
// RUN: %target-build-swift -emit-executable %s -g -o %t/DeclReconstr -emit-module
-// RUN: %lldb-moduleimport-test %t/DeclReconstr \
+// RUN: %lldb-moduleimport-test %t/DeclReconstr -target-triple %target-triple \
// RUN: -decl-from-mangled=%t.input > %t.output 2>&1
// RUN: diff %t.check %t.output
diff --git a/test/DebugInfo/DumpTypeFromMangledName.swift b/test/DebugInfo/DumpTypeFromMangledName.swift
index 240724d..e3602d1 100644
--- a/test/DebugInfo/DumpTypeFromMangledName.swift
+++ b/test/DebugInfo/DumpTypeFromMangledName.swift
@@ -15,3 +15,11 @@
func main() {
struct Patatino {}
}
+
+extension Collection where Element: Equatable {
+ func split<C: Collection>(separatedBy separator: C) -> [SubSequence]
+ where C.Element == Element {
+ var results = [SubSequence]()
+ return results
+ }
+}
diff --git a/test/DebugInfo/Inputs/decl-reconstr-names.txt b/test/DebugInfo/Inputs/decl-reconstr-names.txt
index 03dabbc..988e2ad 100644
--- a/test/DebugInfo/Inputs/decl-reconstr-names.txt
+++ b/test/DebugInfo/Inputs/decl-reconstr-names.txt
@@ -1,2 +1,2 @@
$S12DeclReconstr8patatinoSiyF ---> func patatino() -> Int
-$S12DeclReconstr1SVACycfC ---> Can't resolve decl of $S12DeclReconstr1SVACycfC
+$S12DeclReconstr1SVACycfC ---> init()
diff --git a/test/DebugInfo/Inputs/type-reconstr-names.txt b/test/DebugInfo/Inputs/type-reconstr-names.txt
index 8b171d1..91ad7f2 100644
--- a/test/DebugInfo/Inputs/type-reconstr-names.txt
+++ b/test/DebugInfo/Inputs/type-reconstr-names.txt
@@ -2,3 +2,4 @@
$SytD ---> ()
$Ss5Int32VD ---> Int32
$S4blah4mainyyF8PatatinoL_VMa ---> Can't resolve type of $S4blah4mainyyF8PatatinoL_VMa
+$Ss10CollectionP7Element ---> Collection
diff --git a/test/DebugInfo/liverange-extension.swift b/test/DebugInfo/liverange-extension.swift
index e7d2bfe..a7ba868 100644
--- a/test/DebugInfo/liverange-extension.swift
+++ b/test/DebugInfo/liverange-extension.swift
@@ -1,27 +1,63 @@
// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s
+// REQUIRES: CPU=x86_64
+//
+// We require x86_64 to make the test easier to read. Without this,
+// writing check lines that ensure our asm gadgets match up with the
+// right values is painfully hard to do.
+
func use<T>(_ x: T) {}
func getInt32() -> Int32 { return -1 }
+// CHECK-LABEL: define {{.*}}rangeExtension
public func rangeExtension(_ b: Bool) {
- // CHECK: define {{.*}}rangeExtension
let i = getInt32()
- // CHECK: llvm.dbg.value(metadata i32 [[I:.*]], metadata {{.*}}, metadata
+ // CHECK: [[I:%.*]] = call swiftcc i32 @"{{.*}}getInt32
+ // CHECK-NEXT: [[I_ZEXT:%.*]] = zext i32 [[I]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[I_ZEXT]])
+ // CHECK-NEXT: llvm.dbg.value(metadata i32 [[I]], metadata [[MD_I:!.*]], metadata
+
use(i)
+
+ // CHECK: br i1
+
if b {
+ // CHECK: llvm.dbg.value(metadata i32 [[I]], metadata [[MD_I]]
+
let j = getInt32()
- // CHECK: llvm.dbg.value(metadata i32 [[I]], metadata {{.*}}, metadata
- // CHECK: llvm.dbg.value(metadata i32 [[J:.*]], metadata {{.*}}, metadata
+ // CHECK: [[J:%.*]] = call swiftcc i32 @"{{.*}}getInt32
+ // CHECK-NEXT: [[J_ZEXT:%.*]] = zext i32 [[J]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[J_ZEXT]])
+ // CHECK: llvm.dbg.value(metadata i32 [[J]], metadata [[MD_J:!.*]], metadata
+
use(j)
- // CHECK-DAG: {{(asm sideeffect "", "r".*)|(zext i32)}} [[J]]
- // CHECK-DAG: asm sideeffect "", "r"
+ // CHECK: call swiftcc void @"{{.*}}use
+
+ // CHECK: [[I_ZEXT:%.*]] = zext i32 [[I]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[I_ZEXT]])
+ // CHECK-NEXT: [[J_ZEXT:%.*]] = zext i32 [[J]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[J_ZEXT]])
+
+ // CHECK: br label
}
+
+ // CHECK-NOT: llvm.dbg.value(metadata i32 [[J]]
+ // CHECK: llvm.dbg.value(metadata i32 [[I]]
+
let z = getInt32()
+ // CHECK: [[Z:%.*]] = call swiftcc i32 @"{{.*}}getInt32
+ // CHECK: llvm.dbg.value(metadata i32 [[Z]], metadata [[MD_Z:!.*]], metadata
+
use(z)
- // CHECK-NOT: llvm.dbg.value(metadata i32 [[J]], metadata {{.*}}, metadata
- // CHECK-DAG: llvm.dbg.value(metadata i32 [[I]], metadata {{.*}}, metadata
- // CHECK-DAG: llvm.dbg.value(metadata i32 [[Z:.*]], metadata {{.*}}, metadata
- // CHECK-DAG: {{(asm sideeffect "", "r".*)|(zext i32)}} [[I]]
- // CHECK-DAG: asm sideeffect "", "r"
+ // CHECK: call swiftcc void @"{{.*}}use
+
+ // CHECK: [[I_ZEXT:%.*]] = zext i32 [[I]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[I_ZEXT]])
+ // CHECK-NEXT: [[Z_ZEXT:%.*]] = zext i32 [[Z]] to i64
+ // CHECK-NEXT: call void asm sideeffect "", "r"(i64 [[Z_ZEXT]])
}
+
+// CHECK-DAG: [[MD_I]] = !DILocalVariable(name: "i"
+// CHECK-DAG: [[MD_J]] = !DILocalVariable(name: "j"
+// CHECK-DAG: [[MD_Z]] = !DILocalVariable(name: "z"
diff --git a/test/Demangle/Inputs/manglings.txt b/test/Demangle/Inputs/manglings.txt
index 5b95a43..7f574cd 100644
--- a/test/Demangle/Inputs/manglings.txt
+++ b/test/Demangle/Inputs/manglings.txt
@@ -82,12 +82,12 @@
_TTOFSC3fooFTSdSd_Sd ---> {T:_TFSC3fooFTSdSd_Sd} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
_T03foo3barC3basyAA3zimCAE_tFTo ---> {T:_T03foo3barC3basyAA3zimCAE_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
_T0SC3fooS2d_SdtFTO ---> {T:_T0SC3fooS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
-__$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
-__$SSC3fooyS2d_SdtFTO ---> {T:_$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
+_$s3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$s3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
+_$sSC3fooyS2d_SdtFTO ---> {T:_$sSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
_$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
_$SSC3fooyS2d_SdtFTO ---> {T:_$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
-$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
-$SSC3fooyS2d_SdtFTO ---> {T:$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
+_$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
+_$SSC3fooyS2d_SdtFTO ---> {T:_$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
_TTDFC3foo3bar3basfT3zimCS_3zim_T_ ---> dynamic foo.bar.bas(zim: foo.zim) -> ()
_TFC3foo3bar3basfT3zimCS_3zim_T_ ---> foo.bar.bas(zim: foo.zim) -> ()
_TF3foooi1pFTCS_3barVS_3bas_OS_3zim ---> foo.+ infix(foo.bar, foo.bas) -> foo.zim
diff --git a/test/Driver/batch_mode_bridging_pch.swift b/test/Driver/batch_mode_bridging_pch.swift
index e996aca..06cd9b0 100644
--- a/test/Driver/batch_mode_bridging_pch.swift
+++ b/test/Driver/batch_mode_bridging_pch.swift
@@ -5,6 +5,18 @@
//
// RUN: %swiftc_driver -enable-bridging-pch -v -import-objc-header %t/foo-bridging-header.h -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift %s 2>&1 | %FileCheck %s
//
+// Next we make a module map with an unknown attribute, which will cause an
+// AST-reader warning while (re)parsing the module map, while attaching a PCH.
+// We turn on serialized diagnostics in the frontends, and check that that
+// warning, issued before the batch-mode multi-file diagnostic multiplexor has
+// its file mappings established, does not crash the multiplexor.
+//
+// RUN: %empty-directory(%t/MyModule)
+// RUN: echo 'module MyModule [DefinitelyNotAnAttribute] { header "header.h" export * }' >%t/MyModule/module.modulemap
+// RUN: touch %t/MyModule/header.h
+// RUN: echo '#include "MyModule/header.h"' >>%t/foo-bridging-header.h
+// RUN: %swiftc_driver -enable-bridging-pch -v -I %t -import-objc-header %t/foo-bridging-header.h -enable-batch-mode -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift -serialize-diagnostics %s 2>&1 | %FileCheck %s
+//
// CHECK: -emit-pch
// CHECK: -primary-file {{.*}}/file-01.swift -primary-file {{.*}}/file-02.swift
diff --git a/test/Driver/emit-module-from-sib.swift b/test/Driver/emit-module-from-sib.swift
index a245c47..5b62d1f 100644
--- a/test/Driver/emit-module-from-sib.swift
+++ b/test/Driver/emit-module-from-sib.swift
@@ -2,8 +2,21 @@
// RUN: %target-swiftc_driver -emit-module -module-name test %s -o %t/a.swiftmodule
// RUN: %target-swiftc_driver -emit-sib -module-name test %s -o - | %target-swiftc_driver -emit-module -module-name test -o %t/b.swiftmodule -
-// RUN: cmp %t/a.swiftmodule %t/b.swiftmodule
-// RUN: cmp %t/a.swiftdoc %t/b.swiftdoc
+
+// RUN: mkdir -p %t/a/
+// RUN: cp %t/a.swiftmodule %t/a/test.swiftmodule
+// RUN: mkdir -p %t/b/
+// RUN: cp %t/b.swiftmodule %t/b/test.swiftmodule
+
+// RUN: %target-swift-ide-test -print-module -print-interface -no-empty-line-between-members -module-to-print=test -I %t/a -source-filename=%s > %t.a.swift.txt
+// RUN: %target-swift-ide-test -print-module -print-interface -no-empty-line-between-members -module-to-print=test -I %t/b -source-filename=%s > %t.b.swift.txt
+// RUN: diff -u %t.a.swift.txt %t.b.swift.txt
+
+// Diff the SIL
+// RUN: %target-swift-frontend -emit-sil %t/a/test.swiftmodule > %t.a.sil.txt
+// RUN: %target-swift-frontend -emit-sil %t/b/test.swiftmodule > %t.b.sil.txt
+// RUN: diff -u %t.a.sil.txt %t.b.sil.txt
+
public struct Pair<A, B> {
public var first : A
diff --git a/test/Driver/swift-version.swift b/test/Driver/swift-version.swift
index 31ed2b4..612592f 100644
--- a/test/Driver/swift-version.swift
+++ b/test/Driver/swift-version.swift
@@ -14,7 +14,7 @@
// RUN: not %target-swiftc_driver -swift-version 5 -typecheck %s 2>&1 | %FileCheck --check-prefix ERROR_5 %s
// BAD: invalid value
-// BAD: note: valid arguments to '-swift-version' are '3', '4', '5'
+// BAD: note: valid arguments to '-swift-version' are '3', '4', '4.2', '5'
// FIXIT_3: use major version, as in '-swift-version 3'
// FIXIT_4: use major version, as in '-swift-version 4'
diff --git a/test/Generics/requirement_inference.swift b/test/Generics/requirement_inference.swift
index 28f1d9f..02cd9c0 100644
--- a/test/Generics/requirement_inference.swift
+++ b/test/Generics/requirement_inference.swift
@@ -481,10 +481,28 @@
}
// Extend using the inferred requirement.
-// FIXME: Currently broken.
extension X1WithP2 {
func f() {
- _ = X5<T>() // FIXME: expected-error{{type 'T' does not conform to protocol 'P2'}}
+ _ = X5<T>() // okay: inferred T: P2 from generic typealias
+ }
+}
+
+extension X1: P1 {
+ func p1() { }
+}
+
+typealias X1WithP2Changed<T: P2> = X1<X1<T>>
+typealias X1WithP2MoreArgs<T: P2, U> = X1<T>
+
+extension X1WithP2Changed {
+ func bad1() {
+ _ = X5<T>() // expected-error{{type 'T' does not conform to protocol 'P2'}}
+ }
+}
+
+extension X1WithP2MoreArgs {
+ func bad2() {
+ _ = X5<T>() // expected-error{{type 'T' does not conform to protocol 'P2'}}
}
}
diff --git a/test/IDE/complete_crashes.swift b/test/IDE/complete_crashes.swift
index e40372f..2acd4a5 100644
--- a/test/IDE/complete_crashes.swift
+++ b/test/IDE/complete_crashes.swift
@@ -68,7 +68,7 @@
// GENERIC_PARAM_AND_ASSOC_TYPE: Begin completions
// GENERIC_PARAM_AND_ASSOC_TYPE-DAG: Decl[InstanceVar]/CurrNominal: count[#Int#]; name=count
// GENERIC_PARAM_AND_ASSOC_TYPE-DAG: Decl[GenericTypeParam]/CurrNominal: Key[#Key#]; name=Key
- // GENERIC_PARAM_AND_ASSOC_TYPE-DAG: Decl[TypeAlias]/CurrNominal: Value[#CustomGenericCollection.Value#]; name=Value
+ // GENERIC_PARAM_AND_ASSOC_TYPE-DAG: Decl[TypeAlias]/CurrNominal: Value[#CustomGenericCollection<Key>.Value#]; name=Value
// GENERIC_PARAM_AND_ASSOC_TYPE: End completions
var count: Int { #^GENERIC_PARAM_AND_ASSOC_TYPE^# }
diff --git a/test/IDE/print_synthesized_extensions.swift b/test/IDE/print_synthesized_extensions.swift
index a709399..54e9708 100644
--- a/test/IDE/print_synthesized_extensions.swift
+++ b/test/IDE/print_synthesized_extensions.swift
@@ -278,16 +278,17 @@
// CHECK8: <decl:Struct>public struct <loc>S4<<decl:GenericTypeParam>T</decl>></loc> : <ref:Protocol>P1</ref> {
// CHECK8-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:Struct>Int</ref></decl>
// CHECK8-NEXT: <decl:TypeAlias>public typealias <loc>T2</loc> = <ref:Struct>Int</ref></decl>
-// CHECK8-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref>.<ref:TypeAlias>T1</ref></decl>
-// CHECK8-NEXT: <decl:Func>public func <loc>f2(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref>.<ref:TypeAlias>T2</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref>.<ref:TypeAlias>T2</ref></decl></decl>
+// CHECK8-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T1</ref></decl>
+// CHECK8-NEXT: <decl:Func>public func <loc>f2(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T2</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S4</ref><T>.<ref:TypeAlias>T2</ref></decl></decl>
// CHECK8-NEXT: <decl:Func>public func <loc>p1IntFunc(<decl:Param>i: <ref:Struct>Int</ref></decl>)</loc> -> <ref:Struct>Int</ref></decl>
// CHECK8-NEXT: }</synthesized>
// CHECK9: <decl:Struct>public struct <loc>S6<<decl:GenericTypeParam>T</decl>></loc> : <ref:Protocol>P1</ref> {
// CHECK9-NEXT: <decl:TypeAlias>public typealias <loc>T1</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S5</ref></decl>
// CHECK9-NEXT: <decl:TypeAlias>public typealias <loc>T2</loc> = <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S5</ref></decl>
-// CHECK9-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref>.<ref:TypeAlias>T1</ref></decl>
-// CHECK9-NEXT: <decl:Func>public func <loc>f2(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref>.<ref:TypeAlias>T2</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref>.<ref:TypeAlias>T2</ref></decl></decl>
+// CHECK9-NEXT: <decl:Func>public func <loc>f1(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T1</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T1</ref></decl>
+
+// CHECK9-NEXT: <decl:Func>public func <loc>f2(<decl:Param>t: <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T2</ref></decl>)</loc> -> <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S6</ref><T>.<ref:TypeAlias>T2</ref></decl></decl>
// CHECK9-NEXT: <decl:Extension><decl:Func>public func <loc>f3()</loc></decl></decl>
// CHECK9-NEXT: <decl:Extension><decl:Func>public func <loc>fromActualExtension()</loc></decl></decl>
// CHECK9-NEXT: <decl:Func>public func <loc>p3Func(<decl:Param>i: <ref:Struct>Int</ref></decl>)</loc> -> <ref:Struct>Int</ref></decl>
diff --git a/test/IDE/print_types.swift b/test/IDE/print_types.swift
index 9b61ea5..5096844 100644
--- a/test/IDE/print_types.swift
+++ b/test/IDE/print_types.swift
@@ -6,7 +6,7 @@
typealias MyInt = Int
// CHECK: TypeAliasDecl '''MyInt''' MyInt.Type{{$}}
-// FULL: TypeAliasDecl '''MyInt''' swift_ide_test.MyInt.Type{{$}}
+// FULL: TypeAliasDecl '''MyInt''' MyInt.Type{{$}}
func testVariableTypes(_ param: Int, param2: inout Double) {
// CHECK: FuncDecl '''testVariableTypes''' (Int, inout Double) -> (){{$}}
@@ -16,7 +16,7 @@
// CHECK: VarDecl '''a1''' Int{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
// FULL: VarDecl '''a1''' Swift.Int{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
a1 = 17; _ = a1
@@ -24,14 +24,14 @@
// CHECK: VarDecl '''a2''' Int{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
// FULL: VarDecl '''a2''' Swift.Int{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
a2 = 17; _ = a2
var a3 = Int16(42)
// CHECK: VarDecl '''a3''' Int16{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
// FULL: VarDecl '''a3''' Swift.Int16{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
a3 = 17; _ = a3
@@ -39,21 +39,21 @@
// CHECK: VarDecl '''a4''' Int32{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
// FULL: VarDecl '''a4''' Swift.Int32{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
a4 = 17; _ = a4
var a5 : Int64 = 42
// CHECK: VarDecl '''a5''' Int64{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
// FULL: VarDecl '''a5''' Swift.Int64{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
a5 = 17; _ = a5
var typealias1 : MyInt = 42
// CHECK: VarDecl '''typealias1''' MyInt{{$}}
// CHECK: IntegerLiteralExpr:[[@LINE-2]] '''42''' Int2048{{$}}
-// FULL: VarDecl '''typealias1''' swift_ide_test.MyInt{{$}}
-// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Builtin.Int2048{{$}}
+// FULL: VarDecl '''typealias1''' MyInt{{$}}
+// FULL: IntegerLiteralExpr:[[@LINE-4]] '''42''' Int2048{{$}}
_ = typealias1 ; typealias1 = 1
var optional1 = Optional<Int>.none
@@ -77,11 +77,11 @@
func testFuncType3() -> Void {}
// CHECK: FuncDecl '''testFuncType3''' () -> Void{{$}}
-// FULL: FuncDecl '''testFuncType3''' () -> Swift.Void{{$}}
+// FULL: FuncDecl '''testFuncType3''' () -> Void{{$}}
func testFuncType4() -> MyInt {}
// CHECK: FuncDecl '''testFuncType4''' () -> MyInt{{$}}
-// FULL: FuncDecl '''testFuncType4''' () -> swift_ide_test.MyInt{{$}}
+// FULL: FuncDecl '''testFuncType4''' () -> MyInt{{$}}
func testFuncType5() -> (Int) {}
// CHECK: FuncDecl '''testFuncType5''' () -> (Int){{$}}
diff --git a/test/IRGen/class_resilience.swift b/test/IRGen/class_resilience.swift
index e6e49be..4d43183 100644
--- a/test/IRGen/class_resilience.swift
+++ b/test/IRGen/class_resilience.swift
@@ -323,7 +323,7 @@
// CHECK: [[METADATA:%.*]] = call %swift.type* @swift_relocateClassMetadata({{.*}}, [[INT]] {{60|96}}, [[INT]] 4)
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$S16resilient_struct4SizeVMa"([[INT]] 0)
// CHECK-NEXT: [[SIZE_METADATA:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], [[INT]] 3, {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], [[INT]] 0, [[INT]] 3, {{.*}})
// CHECK-native: [[METADATA_PTR:%.*]] = bitcast %swift.type* [[METADATA]] to [[INT]]*
// CHECK-native-NEXT: [[FIELD_OFFSET_PTR:%.*]] = getelementptr inbounds [[INT]], [[INT]]* [[METADATA_PTR]], [[INT]] {{12|15}}
// CHECK-native-NEXT: [[FIELD_OFFSET:%.*]] = load [[INT]], [[INT]]* [[FIELD_OFFSET_PTR]]
@@ -341,7 +341,7 @@
// CHECK: [[METADATA:%.*]] = call %swift.type* @swift_relocateClassMetadata({{.*}}, [[INT]] {{60|96}}, [[INT]] 3)
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$S16resilient_struct9RectangleVMa"([[INT]] 0)
// CHECK-NEXT: [[RECTANGLE_METADATA:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], [[INT]] 2, {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], [[INT]] 0, [[INT]] 2, {{.*}})
// CHECK-native: [[METADATA_PTR:%.*]] = bitcast %swift.type* [[METADATA]] to [[INT]]*
// CHECK-native-NEXT: [[FIELD_OFFSET_PTR:%.*]] = getelementptr inbounds [[INT]], [[INT]]* [[METADATA_PTR]], [[INT]] {{11|14}}
// CHECK-native-NEXT: [[FIELD_OFFSET:%.*]] = load [[INT]], [[INT]]* [[FIELD_OFFSET_PTR]]
@@ -369,7 +369,7 @@
// CHECK: [[BASE:%.*]] = load [[INT]], [[INT]]* getelementptr inbounds ([[BOUNDS]], [[BOUNDS]]* @"$S16class_resilience14ResilientChildCMo", i32 0, i32 0)
// CHECK: [[OFFSET:%.*]] = add [[INT]] [[BASE]], {{12|24}}
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], [[INT]] 1, i8*** {{.*}}, [[INT]]* {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], [[INT]] 0, [[INT]] 1, i8*** {{.*}}, [[INT]]* {{.*}})
// Initialize constructor vtable override...
// CHECK: [[BASE:%.*]] = load [[INT]], [[INT]]* getelementptr inbounds ([[BOUNDS]], [[BOUNDS]]* @"$S15resilient_class22ResilientOutsideParentCMo", i32 0, i32 0)
@@ -452,5 +452,5 @@
// CHECK: [[SUPER_ADDR:%.*]] = getelementptr inbounds %swift.type*, %swift.type** [[T0]], i32 1
// CHECK: store %swift.type* [[SUPER]], %swift.type** [[SUPER_ADDR]],
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]],
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], [[INT]] 0,
// CHECK: ret %swift.metadata_response zeroinitializer
diff --git a/test/IRGen/concrete_inherits_generic_base.swift b/test/IRGen/concrete_inherits_generic_base.swift
index 2589619..f952ecb 100644
--- a/test/IRGen/concrete_inherits_generic_base.swift
+++ b/test/IRGen/concrete_inherits_generic_base.swift
@@ -80,6 +80,6 @@
// CHECK: [[TMP:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
// CHECK-NEXT: store %swift.type* [[TMP]], %swift.type** getelementptr inbounds ({{.*}} @"$S3foo12SuperDerivedCMf{{.*}}, i32 1), align
// CHECK: [[METADATA:%.*]] = call %swift.type* @swift_relocateClassMetadata({{.*}}, [[INT]] {{60|96}}, [[INT]] 0)
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], [[INT]] 0, {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], [[INT]] 0, {{.*}})
// CHECK: store atomic %swift.type* [[METADATA]], %swift.type** @"$S3foo12SuperDerivedCML" release,
// CHECK: ret void
diff --git a/test/IRGen/generic_classes.sil b/test/IRGen/generic_classes.sil
index 7b13979..882b84d 100644
--- a/test/IRGen/generic_classes.sil
+++ b/test/IRGen/generic_classes.sil
@@ -345,7 +345,7 @@
// CHECK-LABEL: define{{( protected)?}} internal swiftcc %swift.metadata_response @"$S15generic_classes11RootGenericCMr"
// CHECK-SAME: (%swift.type* [[METADATA:%.*]], i8*, i8**) {{.*}} {
// -- initialize the dependent field offsets
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], i64 3, i8*** {{%.*}}, i64* {{%.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], i64 0, i64 3, i8*** {{%.*}}, i64* {{%.*}})
// CHECK: }
// CHECK-LABEL: define{{( protected)?}} internal %swift.type* @"$S15generic_classes22RootGenericFixedLayoutCMi"(%swift.type_descriptor*, i8**, i8**) {{.*}} {
@@ -353,7 +353,7 @@
// CHECK-LABEL: define{{( protected)?}} internal swiftcc %swift.metadata_response @"$S15generic_classes22RootGenericFixedLayoutCMr"
// CHECK-SAME: (%swift.type* [[METADATA:%.*]], i8*, i8**) {{.*}} {
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], i64 3, i8*** {{%.*}}, i64* {{%.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], i64 0, i64 3, i8*** {{%.*}}, i64* {{%.*}})
// CHECK: }
// CHECK-LABEL: define{{( protected)?}} internal %swift.type* @"$S15generic_classes015GenericInheritsC0CMi"(%swift.type_descriptor*, i8**, i8**) {{.*}} {
@@ -383,7 +383,7 @@
// CHECK: [[T0:%.*]] = getelementptr inbounds i8*, i8** [[VWT]], i32 9
// CHECK: [[T1:%.*]] = getelementptr inbounds i8**, i8*** [[FIELDS_ADDR]], i32 0
// CHECK: store i8** [[T0]], i8*** [[T1]], align 8
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], i64 1, i8*** [[FIELDS_ADDR]], i64* [[OFFSETS]])
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], i64 0, i64 1, i8*** [[FIELDS_ADDR]], i64* [[OFFSETS]])
// CHECK: ret %swift.metadata_response zeroinitializer
// CHECK: }
diff --git a/test/IRGen/generic_vtable.swift b/test/IRGen/generic_vtable.swift
index c0febd8..f4a2520 100644
--- a/test/IRGen/generic_vtable.swift
+++ b/test/IRGen/generic_vtable.swift
@@ -108,7 +108,7 @@
// CHECK-LABEL: define internal swiftcc %swift.metadata_response @"$S14generic_vtable7DerivedCMr"
// CHECK-SAME: (%swift.type* [[METADATA:%.*]], i8*, i8**) {{.*}} {
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], i64 0, {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], i64 0, {{.*}})
// -- method override for 'm2()'
// CHECK: [[WORDS:%.*]] = bitcast %swift.type* [[METADATA]] to i8**
@@ -131,7 +131,7 @@
// CHECK: [[SUPERCLASS:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
// CHECK: store %swift.type* [[SUPERCLASS]], %swift.type** getelementptr inbounds {{.*}} @"$S14generic_vtable8ConcreteCMf"
// CHECK: [[METADATA:%.*]] = call %swift.type* @swift_relocateClassMetadata({{.*}}, i64 96, i64 1)
-// CHECK: call void @swift_initClassMetadata_UniversalStrategy(%swift.type* [[METADATA]], i64 0, {{.*}})
+// CHECK: call void @swift_initClassMetadata(%swift.type* [[METADATA]], i64 0, {{.*}})
// -- method override for 'init()'
// CHECK: store i8* bitcast (%T14generic_vtable8ConcreteC* (%T14generic_vtable8ConcreteC*)* @"$S14generic_vtable8ConcreteCACycfc" to i8*), i8**
diff --git a/test/IRGen/mixed_mode_class_with_unimportable_fields.swift b/test/IRGen/mixed_mode_class_with_unimportable_fields.swift
index 5198616..9bf183e 100644
--- a/test/IRGen/mixed_mode_class_with_unimportable_fields.swift
+++ b/test/IRGen/mixed_mode_class_with_unimportable_fields.swift
@@ -67,8 +67,8 @@
}
// CHECK-V3-LABEL: define private void @initialize_metadata_SubButtHolder
-// CHECK-V3: call void @swift_initClassMetadata_UniversalStrategy
+// CHECK-V3: call void @swift_initClassMetadata(
// CHECK-V3-LABEL: define private void @initialize_metadata_SubSubButtHolder
-// CHECK-V3: call void @swift_initClassMetadata_UniversalStrategy
+// CHECK-V3: call void @swift_initClassMetadata(
diff --git a/test/IRGen/objc_class_export.swift.tmp b/test/IRGen/objc_class_export.swift.tmp
deleted file mode 100644
index e2766f6..0000000
--- a/test/IRGen/objc_class_export.swift.tmp
+++ /dev/null
@@ -1,107 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %build-irgen-test-overlays
-// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -I %t -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s
-
-// REQUIRES: CPU=x86_64
-// REQUIRES: objc_interop
-
-// CHECK: %swift.refcounted = type
-// CHECK: [[HOOZIT:%T17objc_class_export6HoozitC]] = type <{ [[REF:%swift.refcounted]] }>
-// CHECK: [[FOO:%T17objc_class_export3FooC]] = type <{ [[REF]], %TSi }>
-// CHECK: [[INT:%TSi]] = type <{ i64 }>
-// CHECK: [[DOUBLE:%TSd]] = type <{ double }>
-// CHECK: [[NSRECT:%TSC6NSRectV]] = type <{ %TSC7NSPointV, %TSC6NSSizeV }>
-// CHECK: [[NSPOINT:%TSC7NSPointV]] = type <{ %TSd, %TSd }>
-// CHECK: [[NSSIZE:%TSC6NSSizeV]] = type <{ %TSd, %TSd }>
-// CHECK: [[OBJC:%objc_object]] = type opaque
-
-// CHECK: @"OBJC_METACLASS_$__TtC17objc_class_export3Foo" = hidden global %objc_class {
-// CHECK: %objc_class* @"OBJC_METACLASS_$__TtCs12_SwiftObject",
-// CHECK: %objc_class* @"OBJC_METACLASS_$__TtCs12_SwiftObject",
-// CHECK: %swift.opaque* @_objc_empty_cache,
-// CHECK: %swift.opaque* null,
-// CHECK: i64 ptrtoint ({{.*}}* @_METACLASS_DATA__TtC17objc_class_export3Foo to i64)
-// CHECK: }
-// CHECK: [[FOO_NAME:@.*]] = private unnamed_addr constant [28 x i8] c"_TtC17objc_class_export3Foo\00"
-// CHECK: @_METACLASS_DATA__TtC17objc_class_export3Foo = private constant {{.*\*}} } {
-// CHECK: i32 129,
-// CHECK: i32 40,
-// CHECK: i32 40,
-// CHECK: i32 0,
-// CHECK: i8* null,
-// CHECK: i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[FOO_NAME]], i64 0, i64 0),
-// CHECK: @_CLASS_METHODS__TtC17objc_class_export3Foo,
-// CHECK: i8* null,
-// CHECK: i8* null,
-// CHECK: i8* null,
-// CHECK: i8* null
-// CHECK: }, section "__DATA, __objc_const", align 8
-// CHECK: @_DATA__TtC17objc_class_export3Foo = private constant {{.*\*}} } {
-// CHECK: i32 128,
-// CHECK: i32 16,
-// CHECK: i32 24,
-// CHECK: i32 0,
-// CHECK: i8* null,
-// CHECK: i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[FOO_NAME]], i64 0, i64 0),
-// CHECK: { i32, i32, [6 x { i8*, i8*, i8* }] }* @_INSTANCE_METHODS__TtC17objc_class_export3Foo,
-// CHECK: i8* null,
-// CHECK: @_IVARS__TtC17objc_class_export3Foo,
-// CHECK: i8* null,
-// CHECK: _PROPERTIES__TtC17objc_class_export3Foo
-// CHECK: }, section "__DATA, __objc_const", align 8
-// CHECK: @"$S17objc_class_export3FooCMf" = internal global <{{.*i64}} }> <{
-// CHECK: void ([[FOO]]*)* @"$S17objc_class_export3FooCfD",
-// CHECK: i8** @"$SBOWV",
-// CHECK: i64 ptrtoint (%objc_class* @"OBJC_METACLASS_$__TtC17objc_class_export3Foo" to i64),
-// CHECK: %objc_class* @"OBJC_CLASS_$__TtCs12_SwiftObject",
-// CHECK: %swift.opaque* @_objc_empty_cache,
-// CHECK: %swift.opaque* null,
-// CHECK: i64 add (i64 ptrtoint ({{.*}}* @_DATA__TtC17objc_class_export3Foo to i64), i64 1),
-// CHECK: [[FOO]]* (%swift.type*)* @"$S17objc_class_export3FooC6createACyFZ",
-// CHECK: void (double, double, double, double, [[FOO]]*)* @"$S17objc_class_export3FooC10drawInRect5dirtyySC6NSRectV_tF"
-// CHECK: }>, section "__DATA,__objc_data, regular"
-// -- TODO: The OBJC_CLASS symbol should reflect the qualified runtime name of
-// Foo.
-// CHECK: @"$S17objc_class_export3FooCN" = hidden alias %swift.type, bitcast (i64* getelementptr inbounds ({{.*}} @"$S17objc_class_export3FooCMf", i32 0, i32 2) to %swift.type*)
-// CHECK: @"OBJC_CLASS_$__TtC17objc_class_export3Foo" = hidden alias %swift.type, %swift.type* @"$S17objc_class_export3FooCN"
-
-import gizmo
-
-class Hoozit {}
-
-struct BigStructWithNativeObjects {
- var x, y, w : Double
- var h : Hoozit
-}
-
-@objc class Foo {
- @objc var x = 0
- @objc class func create() -> Foo {
- return Foo()
- }
-
- @objc func drawInRect(dirty dirty: NSRect) {
- }
- // CHECK: define internal void @"$S17objc_class_export3FooC10drawInRectySC6NSRectV5dirty_tFTo"([[OPAQUE:%.*]]*, i8*, [[NSRECT]]* byval align 8) unnamed_addr {{.*}} {
- // CHECK: [[CAST:%[a-zA-Z0-9]+]] = bitcast [[OPAQUE]]* %0 to [[FOO]]*
- // CHECK: call swiftcc void @"$S17objc_class_export3FooC10drawInRectySC6NSRectV5dirty_tF"(double {{.*}}, double {{.*}}, double {{.*}}, double {{.*}}, [[FOO]]* swiftself [[CAST]])
- // CHECK: }
-
- @objc func bounds() -> NSRect {
- return NSRect(origin: NSPoint(x: 0, y: 0),
- size: NSSize(width: 0, height: 0))
- }
- // CHECK: define internal void @"$S17objc_class_export3FooC6boundsSC6NSRectVyFTo"([[NSRECT]]* noalias nocapture sret, [[OPAQUE4:%.*]]*, i8*) unnamed_addr {{.*}} {
- // CHECK: [[CAST:%[a-zA-Z0-9]+]] = bitcast [[OPAQUE4]]* %1 to [[FOO]]*
- // CHECK: call swiftcc { double, double, double, double } @"$S17objc_class_export3FooC6boundsSC6NSRectVyF"([[FOO]]* swiftself [[CAST]])
-
- @objc func convertRectToBacking(r r: NSRect) -> NSRect {
- return r
- }
- // CHECK: define internal void @"$S17objc_class_export3FooC20convertRectToBackingSC6NSRectVAF1r_tFTo"([[NSRECT]]* noalias nocapture sret, [[OPAQUE5:%.*]]*, i8*, [[NSRECT]]* byval align 8) unnamed_addr {{.*}} {
- // CHECK: [[CAST:%[a-zA-Z0-9]+]] = bitcast [[OPAQUE5]]* %1 to [[FOO]]*
- // CHECK: call swiftcc { double, double, double, double } @"$S17objc_class_export3FooC20convertRectToBackingSC6NSRectVAF1r_tF"(double {{.*}}, double {{.*}}, double {{.*}}, double {{.*}}, [[FOO]]* swiftself [[CAST]])
-
- func doStuffToSwiftSlice(f f: [Int]) {
- }
- // This function is not representable in Objective-C, so don't emit the objc entry point.
diff --git a/test/IRGen/property_descriptor.sil b/test/IRGen/property_descriptor.sil
index e273dec..75c25a3 100644
--- a/test/IRGen/property_descriptor.sil
+++ b/test/IRGen/property_descriptor.sil
@@ -39,13 +39,13 @@
// CHECK-64: @"$S19property_descriptor15ExternalGenericV2roxvpMV" ={{( protected)?}}{{( protected)?}} constant
// CHECK-64-SAME: <{ <i32 0x00ff_fffe>, i32 32 }>, align 8
// CHECK-32: @"$S19property_descriptor15ExternalGenericV2roxvpMV" ={{( protected)?}}{{( protected)?}} constant
-// CHECK-32-SAME: <{ <i32 0x00ff_fffe>, i32 16 }>, align 8
+// CHECK-32-SAME: <{ <i32 0x00ff_fffe>, i32 16 }>, align 4
sil_property #ExternalGeneric.ro <T: Comparable> (
stored_property #ExternalGeneric.ro : $T)
// CHECK-64: @"$S19property_descriptor15ExternalGenericV2rwxvpMV" ={{( protected)?}}{{( protected)?}} constant
// CHECK-64-SAME: <{ <i32 0x00ff_fffe>, i32 40 }>, align 8
// CHECK-32: @"$S19property_descriptor15ExternalGenericV2rwxvpMV" ={{( protected)?}} constant
-// CHECK-32-SAME: <{ <i32 0x00ff_fffe>, i32 20 }>, align 8
+// CHECK-32-SAME: <{ <i32 0x00ff_fffe>, i32 20 }>, align 4
sil_property #ExternalGeneric.rw <T: Comparable> (
stored_property #ExternalGeneric.rw : $T)
@@ -93,7 +93,8 @@
setter @set_computed_generic_subscript : $@convention(thin) <T: Comparable><U: Hashable> (@in_guaranteed T, @inout ExternalGeneric<T>, UnsafeRawPointer) -> ())
// CHECK: @"$S19property_descriptor8ExternalV2roSivpMV" ={{( protected)?}} constant <{ i32 }> zeroinitializer, align 4
-// CHECK: @"$S19property_descriptor8ExternalV2rwSivpMV" ={{( protected)?}} constant <{ i32 }> <{ i32 8 }>, align 4
+// CHECK-64: @"$S19property_descriptor8ExternalV2rwSivpMV" ={{( protected)?}} constant <{ i32 }> <{ i32 8 }>, align 4
+// CHECK-32: @"$S19property_descriptor8ExternalV2rwSivpMV" ={{( protected)?}} constant <{ i32 }> <{ i32 4 }>, align 4
sil_property #External.ro (stored_property #External.ro : $Int)
sil_property #External.rw (stored_property #External.rw : $Int)
sil_property #External.computedRO (
diff --git a/test/IRGen/protocol_metadata.swift b/test/IRGen/protocol_metadata.swift
index 106d0ff..7d182f4 100644
--- a/test/IRGen/protocol_metadata.swift
+++ b/test/IRGen/protocol_metadata.swift
@@ -47,9 +47,9 @@
// CHECK-SAME: @_PROTOCOL_METHOD_TYPES__TtP17protocol_metadata1O_
// CHECK-SAME: }
-// CHECK: [[A_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0 }]
-// CHECK: [[B_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0 }]
-// CHECK: [[C_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0 }]
+// CHECK: [[A_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0, i32 0 }]
+// CHECK: [[B_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0, i32 0 }]
+// CHECK: [[C_REQTS]] = internal unnamed_addr constant [1 x %swift.protocol_requirement] [%swift.protocol_requirement { i32 17, i32 0, i32 0 }]
// -- @objc protocol OPT uses ObjC symbol mangling and layout
// CHECK: @_PROTOCOL__TtP17protocol_metadata3OPT_ = private constant { {{.*}} i32, [4 x i8*]*, i8*, i8* } {
@@ -67,7 +67,7 @@
// CHECK: %swift.protocol* @"$S17protocol_metadata1AMp",
// CHECK: %swift.protocol* @"$S17protocol_metadata1BMp"
// CHECK: }
-// CHECK: [[AB_REQTS:@.*]] = internal unnamed_addr constant [3 x %swift.protocol_requirement] [%swift.protocol_requirement zeroinitializer, %swift.protocol_requirement zeroinitializer, %swift.protocol_requirement { i32 17, i32 0 }]
+// CHECK: [[AB_REQTS:@.*]] = internal unnamed_addr constant [3 x %swift.protocol_requirement] [%swift.protocol_requirement zeroinitializer, %swift.protocol_requirement zeroinitializer, %swift.protocol_requirement { i32 17, i32 0, i32 0 }]
// CHECK: @"$S17protocol_metadata2ABMp" = hidden constant %swift.protocol {
// CHECK-SAME: [[AB_INHERITED]]
// CHECK-SAME: i32 72, i32 7,
@@ -92,17 +92,17 @@
}
// CHECK: [[COMPREHENSIVE_REQTS:@.*]] = internal unnamed_addr constant [11 x %swift.protocol_requirement]
-// CHECK-SAME: [%swift.protocol_requirement { i32 6, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 7, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 2, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 17, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 1, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 19, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 20, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 21, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 3, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 4, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 5, i32 0 }]
+// CHECK-SAME: [%swift.protocol_requirement { i32 6, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 7, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 2, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 17, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 1, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 19, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 20, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 21, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 3, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 4, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 5, i32 0, i32 0 }]
// CHECK: [[COMPREHENSIVE_ASSOC_NAME:@.*]] = private constant [6 x i8] c"Assoc\00"
diff --git a/test/IRGen/protocol_resilience.sil b/test/IRGen/protocol_resilience.sil
index 58dcacc..38acaaf 100644
--- a/test/IRGen/protocol_resilience.sil
+++ b/test/IRGen/protocol_resilience.sil
@@ -15,13 +15,39 @@
// Protocol is public -- needs resilient witness table
// CHECK: [[RP_REQTS:@.*]] = internal unnamed_addr constant [8 x %swift.protocol_requirement]
-// CHECK-SAME: [%swift.protocol_requirement { i32 6, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 7, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 17, i32 0 },
-// CHECK-SAME: %swift.protocol_requirement { i32 17, i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @defaultC to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 4, i32 1) to [[INT]])){{ | to i32\) }}},
-// CHECK-SAME: %swift.protocol_requirement { i32 17, i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @defaultD to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 5, i32 1) to [[INT]])){{ | to i32\) }}},
-// CHECK-SAME: %swift.protocol_requirement { i32 1, i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @defaultE to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 6, i32 1) to [[INT]])){{ | to i32\) }}},
-// CHECK-SAME: %swift.protocol_requirement { i32 1, i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @defaultF to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 7, i32 1) to [[INT]])){{ | to i32\) }}}]
+// CHECK-SAME: [%swift.protocol_requirement { i32 6, i32 0, i32 0 },
+// CHECK-SAME: %swift.protocol_requirement { i32 7, i32 0, i32 0 },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 17,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP10noDefaultAyyFTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 2, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32 0
+// CHECK-SAME: },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 17,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP10noDefaultByyFTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 3, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32 0
+// CHECK-SAME: },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 17,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP8defaultCyyFTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 4, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @defaultC to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 4, i32 2) to [[INT]])){{ | to i32\) }}
+// CHECK-SAME: },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 17,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP8defaultDyyFTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 5, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.opaque*, %swift.type*, i8**)* @defaultD to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 5, i32 2) to [[INT]])){{ | to i32\) }}
+// CHECK-SAME: },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 1,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP8defaultEyyFZTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 6, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @defaultE to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 6, i32 2) to [[INT]])){{ | to i32\) }}
+// CHECK-SAME: },
+
+// CHECK-SAME: %swift.protocol_requirement { i32 1,
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @"$S19protocol_resilience17ResilientProtocolP8defaultFyyFZTj" to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 7, i32 1) to [[INT]])){{,| to i32\),}}
+// CHECK-SAME: i32{{ | trunc \(i64 }}sub ([[INT]] ptrtoint (void (%swift.type*, %swift.type*, i8**)* @defaultF to [[INT]]), [[INT]] ptrtoint (i32* getelementptr inbounds ([8 x %swift.protocol_requirement], [8 x %swift.protocol_requirement]* [[RP_REQTS]], i32 0, i32 7, i32 2) to [[INT]])){{ | to i32\) }}
+// CHECK-SAME: }
+// CHECK-SAME: ]
// CHECK: @"$S19protocol_resilience17ResilientProtocolMp" = {{(protected )?}}constant %swift.protocol {
// CHECK-SAME: i32 1031,
diff --git a/test/Parse/ConditionalCompilation/language_version_explicit.swift b/test/Parse/ConditionalCompilation/language_version_explicit.swift
index 83fd2da..a76963c 100644
--- a/test/Parse/ConditionalCompilation/language_version_explicit.swift
+++ b/test/Parse/ConditionalCompilation/language_version_explicit.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -swift-version 4
+// RUN: %target-typecheck-verify-swift -swift-version 4.2
#if swift(>=4)
let w = 1
diff --git a/stdlib/public/core/DoubleWidth.swift.gyb b/test/Prototypes/DoubleWidth.swift.gyb
similarity index 69%
rename from stdlib/public/core/DoubleWidth.swift.gyb
rename to test/Prototypes/DoubleWidth.swift.gyb
index 61ca8a9..1eeaeada 100644
--- a/stdlib/public/core/DoubleWidth.swift.gyb
+++ b/test/Prototypes/DoubleWidth.swift.gyb
@@ -1,14 +1,8 @@
-//===--- DoubleWidth.swift.gyb --------------------------------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
+// RUN: %target-run-simple-swiftgyb
+// REQUIRES: executable_test
+// REQUIRES: CPU=x86_64
+
+import StdlibUnittest
/// A fixed-width integer that has twice the bit width of its base type.
///
@@ -45,8 +39,7 @@
/// integer type. Nesting `DoubleWidth` instances, in particular, may result in
/// undesirable performance.
@_fixed_layout // FIXME(sil-serialize-all)
-public struct DoubleWidth<Base : FixedWidthInteger> :
- _ExpressibleByBuiltinIntegerLiteral
+public struct DoubleWidth<Base : FixedWidthInteger>
where Base.Magnitude : UnsignedInteger,
Base.Words : Collection, Base.Magnitude.Words : Collection {
@@ -209,6 +202,54 @@
}
}
+#if false
+
+// This conformance is only possible once the type is in the stdlib, as it uses
+// Builtin
+extension DoubleWidth: _ExpressibleByBuiltinIntegerLiteral {
+ @_inlineable // FIXME(sil-serialize-all)
+ public init(_builtinIntegerLiteral _x: _MaxBuiltinIntegerType) {
+ var _x = _x
+ self = DoubleWidth()
+
+ // If we can capture the entire literal in a single Int64, stop there.
+ // This avoids some potential deep recursion due to literal expressions in
+ // other DoubleWidth methods.
+ let (_value, _overflow) = Builtin.s_to_s_checked_trunc_Int2048_Int64(_x)
+ if !Bool(_overflow) {
+ self = DoubleWidth(Int64(_value))
+ return
+ }
+
+ // Convert all but the most significant 64 bits as unsigned integers.
+ let _shift = Builtin.sext_Int64_Int2048((64 as Int64)._value)
+ let lowWordCount = (bitWidth - 1) / 64
+ for i in 0..<lowWordCount {
+ let value =
+ DoubleWidth(UInt64(Builtin.s_to_u_checked_trunc_Int2048_Int64(_x).0))
+ &<< DoubleWidth(i * 64)
+ self |= value
+ _x = Builtin.ashr_Int2048(_x, _shift)
+ }
+
+ // Finally, convert the most significant 64 bits and check for overflow.
+ let overflow: Bool
+ if Base.isSigned {
+ let (_value, _overflow) = Builtin.s_to_s_checked_trunc_Int2048_Int64(_x)
+ self |= DoubleWidth(Int64(_value)) &<< DoubleWidth(lowWordCount * 64)
+ overflow = Bool(_overflow)
+ } else {
+ let (_value, _overflow) = Builtin.s_to_u_checked_trunc_Int2048_Int64(_x)
+ self |= DoubleWidth(UInt64(_value)) &<< DoubleWidth(lowWordCount * 64)
+ overflow = Bool(_overflow)
+ }
+ _precondition(!overflow, "Literal integer out of range for this type")
+ }
+}
+
+#endif
+
+
extension DoubleWidth : FixedWidthInteger {
@_fixed_layout // FIXME(sil-serialize-all)
public struct Words : Collection {
@@ -618,44 +659,9 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public init(_builtinIntegerLiteral _x: _MaxBuiltinIntegerType) {
- var _x = _x
- self = DoubleWidth()
-
- // If we can capture the entire literal in a single Int64, stop there.
- // This avoids some potential deep recursion due to literal expressions in
- // other DoubleWidth methods.
- let (_value, _overflow) = Builtin.s_to_s_checked_trunc_Int2048_Int64(_x)
- if !Bool(_overflow) {
- self = DoubleWidth(Int64(_value))
- return
- }
-
- // Convert all but the most significant 64 bits as unsigned integers.
- let _shift = Builtin.sext_Int64_Int2048((64 as Int64)._value)
- let lowWordCount = (bitWidth - 1) / 64
- for i in 0..<lowWordCount {
- let value =
- DoubleWidth(UInt64(Builtin.s_to_u_checked_trunc_Int2048_Int64(_x).0))
- &<< DoubleWidth(i * 64)
- self |= value
- _x = Builtin.ashr_Int2048(_x, _shift)
- }
-
- // Finally, convert the most significant 64 bits and check for overflow.
- let overflow: Bool
- if Base.isSigned {
- let (_value, _overflow) = Builtin.s_to_s_checked_trunc_Int2048_Int64(_x)
- self |= DoubleWidth(Int64(_value)) &<< DoubleWidth(lowWordCount * 64)
- overflow = Bool(_overflow)
- } else {
- let (_value, _overflow) = Builtin.s_to_u_checked_trunc_Int2048_Int64(_x)
- self |= DoubleWidth(UInt64(_value)) &<< DoubleWidth(lowWordCount * 64)
- overflow = Bool(_overflow)
- }
- _precondition(!overflow, "Literal integer out of range for this type")
+ public init(integerLiteral x: Int) {
+ self.init(x)
}
-
@_inlineable // FIXME(sil-serialize-all)
public var leadingZeroBitCount: Int {
return high == (0 as High)
@@ -816,3 +822,386 @@
extension DoubleWidth : SignedNumeric, SignedInteger
where Base : SignedInteger {}
+
+
+//===----------------------------------------------------------------------===//
+// Tests
+//===----------------------------------------------------------------------===//
+
+var dwTests = TestSuite("DoubleWidth")
+
+typealias UInt128 = DoubleWidth<UInt64>
+typealias UInt256 = DoubleWidth<UInt128>
+typealias UInt512 = DoubleWidth<UInt256>
+typealias UInt1024 = DoubleWidth<UInt512>
+
+typealias Int128 = DoubleWidth<Int64>
+typealias Int256 = DoubleWidth<Int128>
+typealias Int512 = DoubleWidth<Int256>
+typealias Int1024 = DoubleWidth<Int512>
+
+func checkSignedIntegerConformance<T: SignedInteger>(_ x: T) {}
+func checkUnsignedIntegerConformance<T: UnsignedInteger>(_ x: T) {}
+
+dwTests.test("Literals") {
+ let w: DoubleWidth<UInt8> = 100
+ expectTrue(w == 100 as Int)
+
+ let x: DoubleWidth<UInt8> = 1000
+ expectTrue(x == 1000 as Int)
+
+ let y: DoubleWidth<Int8> = 1000
+ expectTrue(y == 1000 as Int)
+
+ let z: DoubleWidth<Int8> = -1000
+ expectTrue(z == -1000 as Int)
+
+ expectCrashLater()
+ _ = -1 as DoubleWidth<UInt8>
+}
+
+#if false
+// Uncomment these tests once _ExpressibleByBuiltinIntegerLiteral
+// conformance is available
+dwTests.test("Literals/Large/Signed") {
+ let a: Int256 =
+ 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ let b: Int256 =
+ -0x8000000000000000000000000000000000000000000000000000000000000000
+ expectEqual(a, Int256.max)
+ expectEqual(b, Int256.min)
+ expectCrashLater()
+ _ = -0x8000000000000000000000000000000000000000000000000000000000000001
+ as Int256
+}
+
+dwTests.test("Literals/Large/SignedOverflow") {
+ expectCrashLater()
+ _ = 0x8000000000000000000000000000000000000000000000000000000000000000
+ as Int256
+}
+
+dwTests.test("Literals/Large/Unsigned") {
+ let a: UInt256 =
+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ let b: UInt256 = 0
+ expectEqual(a, UInt256.max)
+ expectEqual(b, UInt256.min)
+ expectCrashLater()
+ _ = -1 as UInt256
+}
+
+dwTests.test("Literals/Large/UnsignedOverflow") {
+ expectCrashLater()
+ _ = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0
+ as UInt256
+}
+#endif
+
+dwTests.test("Arithmetic/unsigned") {
+ let x: DoubleWidth<UInt8> = 1000
+ let y: DoubleWidth<UInt8> = 1111
+ expectEqual(x + 1, 1001)
+ expectEqual(x + x, 2000)
+ expectEqual(x - (1 as DoubleWidth<UInt8>), 999)
+ expectEqual(x - x, 0)
+ expectEqual(y - x, 111)
+
+ expectEqual(x * 7, 7000)
+ expectEqual(y * 7, 7777)
+
+ expectEqual(x / 3, 333)
+ expectEqual(x / x, 1)
+ expectEqual(x / y, 0)
+ expectEqual(y / x, 1)
+
+ expectEqual(x % 3, 1)
+ expectEqual(x % y, x)
+}
+
+dwTests.test("Arithmetic/signed") {
+ let x: DoubleWidth<Int8> = 1000
+ let y: DoubleWidth<Int8> = -1111
+ expectEqual(x + 1, 1001)
+ expectEqual(x + x, 2000)
+ expectEqual(x - (1 as DoubleWidth<Int8>), 999)
+ expectEqual(x - x, 0)
+ expectEqual(0 - x, -1000)
+ expectEqual(x + y, -111)
+ expectEqual(x - y, 2111)
+
+ expectEqual(x * 7, 7000)
+ expectEqual(y * 7, -7777)
+ expectEqual(x * -7, -7000)
+ expectEqual(y * -7, 7777)
+
+ expectEqual(x / 3, 333)
+ expectEqual(x / -3, -333)
+ expectEqual(x / x, 1)
+ expectEqual(x / y, 0)
+ expectEqual(y / x, -1)
+ expectEqual(y / y, 1)
+
+ expectEqual(x % 3, 1)
+ expectEqual(x % -3, 1)
+ expectEqual(y % 3, -1)
+ expectEqual(y % -3, -1)
+
+ expectEqual(-y, 1111)
+ expectEqual(-x, -1000)
+}
+
+dwTests.test("Nested") {
+ do {
+ let x = UInt1024.max
+ let (y, o) = x.addingReportingOverflow(1)
+ expectEqual(y, 0)
+ expectTrue(y == (0 as Int))
+ expectTrue(o)
+ }
+
+ do {
+ let x = Int1024.max
+ let (y, o) = x.addingReportingOverflow(1)
+ expectEqual(y, Int1024.min)
+ expectLT(y, 0)
+ expectTrue(y < (0 as Int))
+ expectTrue(y < (0 as UInt))
+ expectTrue(o)
+ }
+
+ expectFalse(UInt1024.isSigned)
+ expectEqual(UInt1024.bitWidth, 1024)
+ expectTrue(Int1024.isSigned)
+ expectEqual(Int1024.bitWidth, 1024)
+
+ expectEqualSequence(
+ UInt1024.max.words, repeatElement(UInt.max, count: 1024 / UInt.bitWidth))
+}
+
+dwTests.test("inits") {
+ typealias DWU16 = DoubleWidth<UInt8>
+
+ expectTrue(DWU16(UInt16.max) == UInt16.max)
+ expectNil(DWU16(exactly: UInt32.max))
+ expectEqual(DWU16(truncatingIfNeeded: UInt64.max), DWU16.max)
+
+ expectCrashLater()
+ _ = DWU16(UInt32.max)
+}
+
+dwTests.test("Magnitude") {
+ typealias DWU16 = DoubleWidth<UInt8>
+ typealias DWI16 = DoubleWidth<Int8>
+
+ expectTrue(DWU16.min.magnitude == UInt16.min.magnitude)
+ expectTrue((42 as DWU16).magnitude == (42 as UInt16).magnitude)
+ expectTrue(DWU16.max.magnitude == UInt16.max.magnitude)
+
+ expectTrue(DWI16.min.magnitude == Int16.min.magnitude)
+ expectTrue((-42 as DWI16).magnitude == (-42 as Int16).magnitude)
+ expectTrue(DWI16().magnitude == Int16(0).magnitude) // See SR-6602.
+ expectTrue((42 as DWI16).magnitude == (42 as Int16).magnitude)
+ expectTrue(DWI16.max.magnitude == Int16.max.magnitude)
+}
+
+dwTests.test("TwoWords") {
+ typealias DW = DoubleWidth<Int>
+
+ expectEqual(-1 as DW, DW(truncatingIfNeeded: -1 as Int8))
+
+ expectNil(Int(exactly: DW(Int.min) - 1))
+ expectNil(Int(exactly: DW(Int.max) + 1))
+
+ expectTrue(DW(Int.min) - 1 < Int.min)
+ expectTrue(DW(Int.max) + 1 > Int.max)
+}
+
+dwTests.test("Bitshifts") {
+ typealias DWU64 = DoubleWidth<DoubleWidth<DoubleWidth<UInt8>>>
+ typealias DWI64 = DoubleWidth<DoubleWidth<DoubleWidth<Int8>>>
+
+ func f<T: FixedWidthInteger, U: FixedWidthInteger>(_ x: T, type: U.Type) {
+ let y = U(x)
+ expectEqual(T.bitWidth, U.bitWidth)
+ for i in -(T.bitWidth + 1)...(T.bitWidth + 1) {
+ expectTrue(x << i == y << i)
+ expectTrue(x >> i == y >> i)
+
+ expectTrue(x &<< i == y &<< i)
+ expectTrue(x &>> i == y &>> i)
+ }
+ }
+
+ f(1 as UInt64, type: DWU64.self)
+ f(~(~0 as UInt64 >> 1), type: DWU64.self)
+ f(UInt64.max, type: DWU64.self)
+ // 0b01010101_10100101_11110000_10100101_11110000_10100101_11110000_10100101
+ f(17340530535757639845 as UInt64, type: DWU64.self)
+
+ f(1 as Int64, type: DWI64.self)
+ f(Int64.min, type: DWI64.self)
+ f(Int64.max, type: DWI64.self)
+ // 0b01010101_10100101_11110000_10100101_11110000_10100101_11110000_10100101
+ f(6171603459878809765 as Int64, type: DWI64.self)
+}
+
+dwTests.test("Remainder/DividingBy0") {
+ func f(_ x: Int1024, _ y: Int1024) -> Int1024 {
+ return x % y
+ }
+ expectCrashLater()
+ _ = f(42, 0)
+}
+
+dwTests.test("RemainderReportingOverflow/DividingByMinusOne") {
+ func f(_ x: Int256, _ y: Int256) -> Int256 {
+ return x.remainderReportingOverflow(dividingBy: y).partialValue
+ }
+ expectEqual(f(.max, -1), 0)
+ expectEqual(f(.min, -1), 0)
+}
+
+dwTests.test("Division/By0") {
+ func f(_ x: Int1024, _ y: Int1024) -> Int1024 {
+ return x / y
+ }
+ expectCrashLater()
+ _ = f(42, 0)
+}
+
+dwTests.test("DivideMinByMinusOne") {
+ func f(_ x: Int1024) -> Int1024 {
+ return x / -1
+ }
+ expectCrashLater()
+ _ = f(Int1024.min)
+}
+
+dwTests.test("MultiplyMinByMinusOne") {
+ func f(_ x: Int1024) -> Int1024 {
+ return x * -1
+ }
+ expectCrashLater()
+ _ = f(Int1024.min)
+}
+
+typealias DWI16 = DoubleWidth<Int8>
+typealias DWU16 = DoubleWidth<UInt8>
+
+dwTests.test("Conversions") {
+ expectTrue(DWI16(1 << 15 - 1) == Int(1 << 15 - 1))
+ expectTrue(DWI16(-1 << 15) == Int(-1 << 15))
+ expectTrue(DWU16(1 << 16 - 1) == Int(1 << 16 - 1))
+ expectTrue(DWU16(0) == Int(0))
+
+ expectTrue(DWI16(Double(1 << 15 - 1)) == Int(1 << 15 - 1))
+ expectTrue(DWI16(Double(-1 << 15)) == Int(-1 << 15))
+ expectTrue(DWU16(Double(1 << 16 - 1)) == Int(1 << 16 - 1))
+ expectTrue(DWU16(Double(0)) == Int(0))
+
+ expectTrue(DWI16(Double(1 << 15 - 1) + 0.9) == Int(1 << 15 - 1))
+ expectTrue(DWI16(Double(-1 << 15) - 0.9) == Int(-1 << 15))
+ expectTrue(DWU16(Double(1 << 16 - 1) + 0.9) == Int(1 << 16 - 1))
+ expectTrue(DWU16(Double(0) - 0.9) == Int(0))
+
+ expectEqual(DWI16(0.00001), 0)
+ expectEqual(DWU16(0.00001), 0)
+}
+
+dwTests.test("Exact Conversions") {
+ expectEqual(DWI16(Double(1 << 15 - 1)), DWI16(exactly: Double(1 << 15 - 1))!)
+ expectEqual(DWI16(Double(-1 << 15)), DWI16(exactly: Double(-1 << 15))!)
+ expectEqual(DWU16(Double(1 << 16 - 1)), DWU16(exactly: Double(1 << 16 - 1))!)
+ expectEqual(DWU16(Double(0)), DWU16(exactly: Double(0))!)
+
+ expectNil(DWI16(exactly: Double(1 << 15 - 1) + 0.9))
+ expectNil(DWI16(exactly: Double(-1 << 15) - 0.9))
+ expectNil(DWU16(exactly: Double(1 << 16 - 1) + 0.9))
+ expectNil(DWU16(exactly: Double(0) - 0.9))
+
+ expectNil(DWI16(exactly: Double(1 << 15)))
+ expectNil(DWI16(exactly: Double(-1 << 15) - 1))
+ expectNil(DWU16(exactly: Double(1 << 16)))
+ expectNil(DWU16(exactly: Double(-1)))
+
+ expectNil(DWI16(exactly: 0.00001))
+ expectNil(DWU16(exactly: 0.00001))
+
+ expectNil(DWU16(exactly: Double.nan))
+ expectNil(DWU16(exactly: Float.nan))
+ expectNil(DWU16(exactly: Double.infinity))
+ expectNil(DWU16(exactly: Float.infinity))
+}
+
+dwTests.test("Conversions/SignedMax+1") {
+ expectCrashLater()
+ _ = DWI16(1 << 15)
+}
+
+dwTests.test("Conversions/SignedMin-1") {
+ expectCrashLater()
+ _ = DWI16(-1 << 15 - 1)
+}
+
+dwTests.test("Conversions/UnsignedMax+1") {
+ expectCrashLater()
+ _ = DWU16(1 << 16)
+}
+
+dwTests.test("Conversions/Unsigned-1") {
+ expectCrashLater()
+ _ = DWU16(-1)
+}
+
+dwTests.test("Conversions/String") {
+ expectEqual(String(Int256.max, radix: 16),
+ "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
+ expectEqual(String(Int256.min, radix: 16),
+ "-8000000000000000000000000000000000000000000000000000000000000000")
+
+ expectEqual(String(Int256.max, radix: 2), """
+ 1111111111111111111111111111111111111111111111111111111111111111\
+ 1111111111111111111111111111111111111111111111111111111111111111\
+ 1111111111111111111111111111111111111111111111111111111111111111\
+ 111111111111111111111111111111111111111111111111111111111111111
+ """)
+ expectEqual(String(Int256.min, radix: 2), """
+ -100000000000000000000000000000000000000000000000000000000000000\
+ 0000000000000000000000000000000000000000000000000000000000000000\
+ 0000000000000000000000000000000000000000000000000000000000000000\
+ 00000000000000000000000000000000000000000000000000000000000000000
+ """)
+
+ expectEqual(String(Int128.max, radix: 10),
+ "170141183460469231731687303715884105727")
+ expectEqual(String(Int128.min, radix: 10),
+ "-170141183460469231731687303715884105728")
+}
+
+dwTests.test("Words") {
+ expectEqualSequence((0 as DoubleWidth<Int8>).words, [0])
+ expectEqualSequence((1 as DoubleWidth<Int8>).words, [1])
+ expectEqualSequence((-1 as DoubleWidth<Int8>).words, [UInt.max])
+ expectEqualSequence((256 as DoubleWidth<Int8>).words, [256])
+ expectEqualSequence((-256 as DoubleWidth<Int8>).words, [UInt.max - 255])
+ expectEqualSequence(DoubleWidth<Int8>.max.words, [32767])
+ expectEqualSequence(DoubleWidth<Int8>.min.words, [UInt.max - 32767])
+
+ expectEqualSequence((0 as Int1024).words,
+ repeatElement(0 as UInt, count: 1024 / UInt.bitWidth))
+ expectEqualSequence((-1 as Int1024).words,
+ repeatElement(UInt.max, count: 1024 / UInt.bitWidth))
+ expectEqualSequence((1 as Int1024).words,
+ [1] + Array(repeating: 0, count: 1024 / UInt.bitWidth - 1))
+}
+
+dwTests.test("Conditional Conformance") {
+ checkSignedIntegerConformance(0 as Int128)
+ checkSignedIntegerConformance(0 as Int1024)
+
+ checkUnsignedIntegerConformance(0 as UInt128)
+ checkUnsignedIntegerConformance(0 as UInt1024)
+}
+
+runAllTests()
diff --git a/test/Sema/accessibility_private.swift b/test/Sema/accessibility_private.swift
index 33a6370..5238c95 100644
--- a/test/Sema/accessibility_private.swift
+++ b/test/Sema/accessibility_private.swift
@@ -147,14 +147,14 @@
}
extension Container {
- private typealias ExtensionConflictingType = Int // expected-note {{found candidate with type}} expected-note {{previously declared here}}
+ private typealias ExtensionConflictingType = Int // expected-note {{found candidate with type}} expected-note {{previously declared here}} expected-note{{found this candidate}}
}
extension Container {
- private typealias ExtensionConflictingType = Double // expected-error {{invalid redeclaration of 'ExtensionConflictingType'}} expected-note {{found candidate with type}}
+ private typealias ExtensionConflictingType = Double // expected-error {{invalid redeclaration of 'ExtensionConflictingType'}} expected-note {{found candidate with type}} expected-note{{found this candidate}}
}
extension Container {
func test() {
- let a: ExtensionConflictingType? = nil
+ let a: ExtensionConflictingType? = nil // expected-error{{'ExtensionConflictingType' is ambiguous for type lookup in this context}}
let b: Container.ExtensionConflictingType? = nil // expected-error {{ambiguous type name 'ExtensionConflictingType' in 'Container'}}
_ = ExtensionConflictingType()
_ = Container.ExtensionConflictingType()
diff --git a/test/Serialization/Recovery/crash-recovery.swift b/test/Serialization/Recovery/crash-recovery.swift
index e198b5d..c110d97 100644
--- a/test/Serialization/Recovery/crash-recovery.swift
+++ b/test/Serialization/Recovery/crash-recovery.swift
@@ -2,7 +2,7 @@
// RUN: %target-swift-frontend -emit-module -o %t -module-name Lib -I %S/Inputs/custom-modules -swift-version 3 %s
// RUN: echo 'import Lib; _ = Sub.disappearingMethod' | not --crash %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -swift-version 3 -disable-deserialization-recovery -Xcc -DBAD - 2>&1 | %FileCheck -check-prefix CHECK-CRASH -check-prefix CHECK-CRASH-3 %s
-// RUN: echo 'import Lib; _ = Sub.disappearingMethod' | not --crash %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -swift-version 4 -disable-deserialization-recovery -Xcc -DBAD - 2>&1 | %FileCheck -check-prefix CHECK-CRASH -check-prefix CHECK-CRASH-4 %s
+// RUN: echo 'import Lib; _ = Sub.disappearingMethod' | not --crash %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -swift-version 4.2 -disable-deserialization-recovery -Xcc -DBAD - 2>&1 | %FileCheck -check-prefix CHECK-CRASH -check-prefix CHECK-CRASH-4 %s
// REQUIRES: objc_interop
diff --git a/test/Serialization/Recovery/types-4-to-3.swift b/test/Serialization/Recovery/types-4-to-3.swift
index f1e216f..0610786 100644
--- a/test/Serialization/Recovery/types-4-to-3.swift
+++ b/test/Serialization/Recovery/types-4-to-3.swift
@@ -16,8 +16,8 @@
func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 4.2) because it has overridable members that could not be loaded in Swift 3.4}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 4.2) because it has requirements that could not be loaded in Swift 3.4}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 4.1.50) because it has overridable members that could not be loaded in Swift 3.4}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 4.1.50) because it has requirements that could not be loaded in Swift 3.4}}
#else // TEST
diff --git a/test/SourceKit/DocSupport/doc_clang_module.swift.response b/test/SourceKit/DocSupport/doc_clang_module.swift.response
index 3707738..3c5a0ce 100644
--- a/test/SourceKit/DocSupport/doc_clang_module.swift.response
+++ b/test/SourceKit/DocSupport/doc_clang_module.swift.response
@@ -61,7 +61,7 @@
extension FooRuncingOptions {
- convenience init<S>(_ sequence: S) where S : Sequence, FooRuncingOptions.Element == S.Element
+ convenience init<S>(_ sequence: S) where S : Sequence, Element == S.Element
mutating func subtract(_ other: FooRuncingOptions)
@@ -1227,711 +1227,721 @@
key.length: 8
},
{
- key.kind: source.lang.swift.ref.struct,
- key.name: "FooRuncingOptions",
- key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1440,
- key.length: 17
- },
- {
key.kind: source.lang.swift.ref.typealias,
key.name: "Element",
key.usr: "s:So17FooRuncingOptionsV7Elementa",
- key.offset: 1458,
+ key.offset: 1440,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
- key.offset: 1469,
+ key.offset: 1451,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
- key.offset: 1471,
+ key.offset: 1453,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 1484,
+ key.offset: 1466,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1493,
+ key.offset: 1475,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1498,
+ key.offset: 1480,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1507,
+ key.offset: 1489,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1509,
+ key.offset: 1491,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1516,
+ key.offset: 1498,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1540,
+ key.offset: 1522,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1545,
+ key.offset: 1527,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1554,
+ key.offset: 1536,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1557,
+ key.offset: 1539,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1564,
+ key.offset: 1546,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 1586,
+ key.offset: 1568,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1596,
+ key.offset: 1578,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1601,
+ key.offset: 1583,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1612,
+ key.offset: 1594,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1615,
+ key.offset: 1597,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1622,
+ key.offset: 1604,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 1644,
+ key.offset: 1626,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1654,
+ key.offset: 1636,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1659,
+ key.offset: 1641,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1670,
+ key.offset: 1652,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1675,
+ key.offset: 1657,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1682,
+ key.offset: 1664,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 1704,
+ key.offset: 1686,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1714,
+ key.offset: 1696,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1719,
+ key.offset: 1701,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1731,
+ key.offset: 1713,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1733,
+ key.offset: 1715,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1740,
+ key.offset: 1722,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1762,
+ key.offset: 1744,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1785,
+ key.offset: 1767,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1789,
+ key.offset: 1771,
key.length: 7
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
+ key.offset: 1780,
+ key.length: 4
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 1787,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 1798,
key.length: 4
},
{
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1805,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1816,
- key.length: 4
- },
- {
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1821,
+ key.offset: 1803,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1838,
+ key.offset: 1820,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1841,
+ key.offset: 1823,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1848,
+ key.offset: 1830,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 1870,
+ key.offset: 1852,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1880,
+ key.offset: 1862,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1885,
+ key.offset: 1867,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1900,
+ key.offset: 1882,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1903,
+ key.offset: 1885,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1910,
+ key.offset: 1892,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 1932,
+ key.offset: 1914,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1940,
+ key.offset: 1922,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1950,
+ key.offset: 1932,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 1975,
+ key.offset: 1957,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 1980,
+ key.offset: 1962,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 1986,
+ key.offset: 1968,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 1988,
+ key.offset: 1970,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 1995,
+ key.offset: 1977,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2017,
+ key.offset: 1999,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2040,
+ key.offset: 2022,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2045,
+ key.offset: 2027,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2058,
+ key.offset: 2040,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2060,
+ key.offset: 2042,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2067,
+ key.offset: 2049,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2089,
+ key.offset: 2071,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2112,
+ key.offset: 2094,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2117,
+ key.offset: 2099,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2137,
+ key.offset: 2119,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2139,
+ key.offset: 2121,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2146,
+ key.offset: 2128,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2168,
+ key.offset: 2150,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2189,
+ key.offset: 2171,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2199,
+ key.offset: 2181,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2224,
+ key.offset: 2206,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2229,
+ key.offset: 2211,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2238,
+ key.offset: 2220,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2240,
+ key.offset: 2222,
key.length: 6
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2248,
+ key.offset: 2230,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 2270,
+ key.offset: 2252,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2280,
+ key.offset: 2262,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2289,
+ key.offset: 2271,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2294,
+ key.offset: 2276,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2301,
+ key.offset: 2283,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2303,
+ key.offset: 2285,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2314,
+ key.offset: 2296,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2337,
+ key.offset: 2319,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 2347,
+ key.offset: 2329,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2353,
+ key.offset: 2335,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2372,
+ key.offset: 2354,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2396,
+ key.offset: 2378,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2405,
+ key.offset: 2387,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2410,
+ key.offset: 2392,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2417,
+ key.offset: 2399,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2419,
+ key.offset: 2401,
key.length: 6
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2427,
+ key.offset: 2409,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2449,
+ key.offset: 2431,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2473,
+ key.offset: 2455,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2482,
+ key.offset: 2464,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2487,
+ key.offset: 2469,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2494,
+ key.offset: 2476,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2499,
+ key.offset: 2481,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2510,
+ key.offset: 2492,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2532,
+ key.offset: 2514,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2554,
+ key.offset: 2536,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2564,
+ key.offset: 2546,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2589,
+ key.offset: 2571,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2601,
+ key.offset: 2583,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2613,
+ key.offset: 2595,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2622,
+ key.offset: 2604,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2627,
+ key.offset: 2609,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2637,
+ key.offset: 2619,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2639,
+ key.offset: 2621,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2646,
+ key.offset: 2628,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2670,
+ key.offset: 2652,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2679,
+ key.offset: 2661,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2684,
+ key.offset: 2666,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2701,
+ key.offset: 2683,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2703,
+ key.offset: 2685,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2710,
+ key.offset: 2692,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 2734,
+ key.offset: 2716,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2743,
+ key.offset: 2725,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2748,
+ key.offset: 2730,
key.length: 23
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2772,
+ key.offset: 2754,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2774,
+ key.offset: 2756,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
key.usr: "c:@E@FooRuncingOptions",
- key.offset: 2781,
+ key.offset: 2763,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2802,
+ key.offset: 2784,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2809,
+ key.offset: 2791,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 2809,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 2813,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
+ key.offset: 2816,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 2827,
key.length: 3
},
@@ -1942,108 +1952,108 @@
},
{
key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
+ key.name: "Double",
+ key.usr: "s:Sd",
key.offset: 2834,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2845,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2849,
- key.length: 1
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Double",
- key.usr: "s:Sd",
- key.offset: 2852,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2864,
+ key.offset: 2846,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2876,
+ key.offset: 2858,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2881,
+ key.offset: 2863,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2883,
+ key.offset: 2865,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 2886,
+ key.offset: 2868,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 2893,
+ key.offset: 2875,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 2895,
+ key.offset: 2877,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Double",
key.usr: "s:Sd",
- key.offset: 2898,
+ key.offset: 2880,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2908,
+ key.offset: 2890,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2918,
+ key.offset: 2900,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UnsafeMutablePointer",
key.usr: "s:Sp",
- key.offset: 2938,
+ key.offset: 2920,
key.length: 20
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooStruct1",
key.usr: "c:@S@FooStruct1",
- key.offset: 2959,
+ key.offset: 2941,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 2971,
+ key.offset: 2953,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 2978,
+ key.offset: 2960,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 2978,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 2982,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
+ key.offset: 2985,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 2996,
key.length: 3
},
@@ -2054,101 +2064,101 @@
},
{
key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
+ key.name: "Double",
+ key.usr: "s:Sd",
key.offset: 3003,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3014,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3018,
- key.length: 1
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Double",
- key.usr: "s:Sd",
- key.offset: 3021,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3033,
+ key.offset: 3015,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3045,
+ key.offset: 3027,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3050,
+ key.offset: 3032,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3052,
+ key.offset: 3034,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3055,
+ key.offset: 3037,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3062,
+ key.offset: 3044,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3064,
+ key.offset: 3046,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Double",
key.usr: "s:Sd",
- key.offset: 3067,
+ key.offset: 3049,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3077,
+ key.offset: 3059,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3087,
+ key.offset: 3069,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooStruct2",
key.usr: "c:@S@FooStruct2",
- key.offset: 3107,
+ key.offset: 3089,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3118,
+ key.offset: 3100,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3125,
+ key.offset: 3107,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 3132,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 3136,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
+ key.offset: 3139,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 3150,
key.length: 3
},
@@ -2159,2385 +2169,2368 @@
},
{
key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
+ key.name: "Double",
+ key.usr: "s:Sd",
key.offset: 3157,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3168,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3172,
- key.length: 1
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Double",
- key.usr: "s:Sd",
- key.offset: 3175,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3187,
+ key.offset: 3169,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3199,
+ key.offset: 3181,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3204,
+ key.offset: 3186,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3206,
+ key.offset: 3188,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3209,
+ key.offset: 3191,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3216,
+ key.offset: 3198,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3218,
+ key.offset: 3200,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Double",
key.usr: "s:Sd",
- key.offset: 3221,
+ key.offset: 3203,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3231,
+ key.offset: 3213,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3241,
+ key.offset: 3223,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3255,
+ key.offset: 3237,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3261,
+ key.offset: 3243,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3265,
+ key.offset: 3247,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3276,
+ key.offset: 3258,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3282,
+ key.offset: 3264,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3287,
+ key.offset: 3269,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3296,
+ key.offset: 3278,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3298,
+ key.offset: 3280,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3301,
+ key.offset: 3283,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3311,
+ key.offset: 3293,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3317,
+ key.offset: 3299,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3322,
+ key.offset: 3304,
key.length: 22
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3345,
+ key.offset: 3327,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3347,
+ key.offset: 3329,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3350,
+ key.offset: 3332,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3360,
+ key.offset: 3342,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3366,
+ key.offset: 3348,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3371,
+ key.offset: 3353,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3380,
+ key.offset: 3362,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3382,
+ key.offset: 3364,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3385,
+ key.offset: 3367,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3392,
+ key.offset: 3374,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3394,
+ key.offset: 3376,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Float",
key.usr: "s:Sf",
- key.offset: 3397,
+ key.offset: 3379,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3404,
+ key.offset: 3386,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3406,
+ key.offset: 3388,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Double",
key.usr: "s:Sd",
- key.offset: 3409,
+ key.offset: 3391,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3417,
+ key.offset: 3399,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3419,
+ key.offset: 3401,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UnsafeMutablePointer",
key.usr: "s:Sp",
- key.offset: 3422,
+ key.offset: 3404,
key.length: 20
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3443,
+ key.offset: 3425,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3455,
+ key.offset: 3437,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3461,
+ key.offset: 3443,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3466,
+ key.offset: 3448,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3483,
+ key.offset: 3465,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3485,
+ key.offset: 3467,
key.length: 3
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Float",
key.usr: "s:Sf",
- key.offset: 3492,
+ key.offset: 3474,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3502,
+ key.offset: 3484,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3511,
+ key.offset: 3493,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3516,
+ key.offset: 3498,
key.length: 26
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3543,
+ key.offset: 3525,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3545,
+ key.offset: 3527,
key.length: 4
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Float",
key.usr: "s:Sf",
- key.offset: 3553,
+ key.offset: 3535,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3563,
+ key.offset: 3545,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3572,
+ key.offset: 3554,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3577,
+ key.offset: 3559,
key.length: 16
},
{
key.kind: source.lang.swift.ref.enum,
key.name: "Never",
key.usr: "s:s5NeverO",
- key.offset: 3599,
+ key.offset: 3581,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3605,
+ key.offset: 3587,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3610,
+ key.offset: 3592,
key.length: 16
},
{
key.kind: source.lang.swift.ref.enum,
key.name: "Never",
key.usr: "s:s5NeverO",
- key.offset: 3632,
+ key.offset: 3614,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3638,
+ key.offset: 3620,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3643,
+ key.offset: 3625,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3665,
+ key.offset: 3647,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3670,
+ key.offset: 3652,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3692,
+ key.offset: 3674,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3697,
+ key.offset: 3679,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3719,
+ key.offset: 3701,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3724,
+ key.offset: 3706,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3746,
+ key.offset: 3728,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3751,
+ key.offset: 3733,
key.length: 19
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3773,
+ key.offset: 3755,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3778,
+ key.offset: 3760,
key.length: 32
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 3811,
+ key.offset: 3793,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 3813,
+ key.offset: 3795,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3816,
+ key.offset: 3798,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 3826,
+ key.offset: 3808,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3832,
+ key.offset: 3814,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3841,
+ key.offset: 3823,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3864,
+ key.offset: 3846,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3869,
+ key.offset: 3851,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3889,
+ key.offset: 3871,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3894,
+ key.offset: 3876,
key.length: 33
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3935,
+ key.offset: 3917,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3940,
+ key.offset: 3922,
key.length: 33
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3981,
+ key.offset: 3963,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 3988,
+ key.offset: 3970,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 3993,
+ key.offset: 3975,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4000,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 4004,
+ key.length: 12
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
key.offset: 4018,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4026,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4030,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4041,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4022,
+ key.offset: 4045,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4036,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4044,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4048,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4059,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4067,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4071,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4082,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4063,
+ key.offset: 4086,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4077,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4085,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4089,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4100,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4104,
- key.length: 12
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
- key.offset: 4118,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4126,
+ key.offset: 4108,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4134,
+ key.offset: 4116,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4143,
+ key.offset: 4125,
key.length: 18
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "FooProtocolBase",
key.usr: "c:objc(pl)FooProtocolBase",
- key.offset: 4164,
+ key.offset: 4146,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4184,
+ key.offset: 4166,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4190,
+ key.offset: 4172,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4210,
+ key.offset: 4192,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4215,
+ key.offset: 4197,
key.length: 20
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4243,
+ key.offset: 4225,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4248,
+ key.offset: 4230,
key.length: 20
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 4269,
+ key.offset: 4251,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 4271,
+ key.offset: 4253,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4281,
+ key.offset: 4263,
key.length: 3
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 4290,
+ key.offset: 4272,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4309,
+ key.offset: 4291,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 4322,
+ key.offset: 4304,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4334,
+ key.offset: 4316,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 4340,
+ key.offset: 4322,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 4346,
+ key.offset: 4328,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Float",
key.usr: "s:Sf",
- key.offset: 4349,
+ key.offset: 4331,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4361,
+ key.offset: 4343,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4366,
+ key.offset: 4348,
key.length: 29
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4403,
+ key.offset: 4385,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4409,
+ key.offset: 4391,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4414,
+ key.offset: 4396,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4439,
+ key.offset: 4421,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4444,
+ key.offset: 4426,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4464,
+ key.offset: 4446,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4474,
+ key.offset: 4456,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4479,
+ key.offset: 4461,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4499,
+ key.offset: 4481,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4509,
+ key.offset: 4491,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4514,
+ key.offset: 4496,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4535,
+ key.offset: 4517,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4545,
+ key.offset: 4527,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4550,
+ key.offset: 4532,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4570,
+ key.offset: 4552,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4577,
+ key.offset: 4559,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4583,
+ key.offset: 4565,
key.length: 15
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 4601,
+ key.offset: 4583,
key.length: 12
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "FooProtocolDerived",
key.usr: "c:objc(pl)FooProtocolDerived",
- key.offset: 4615,
+ key.offset: 4597,
key.length: 18
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4623,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 4627,
+ key.length: 12
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
key.offset: 4641,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4652,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4645,
+ key.offset: 4656,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4659,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4670,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 4681,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4674,
+ key.offset: 4685,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4688,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4699,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4703,
- key.length: 12
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
- key.offset: 4717,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4725,
+ key.offset: 4707,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4736,
+ key.offset: 4718,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4741,
+ key.offset: 4723,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4765,
+ key.offset: 4747,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4770,
+ key.offset: 4752,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 4787,
+ key.offset: 4769,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 4789,
+ key.offset: 4771,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4792,
+ key.offset: 4774,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4804,
+ key.offset: 4786,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4809,
+ key.offset: 4791,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
+ key.offset: 4808,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.parameter,
+ key.offset: 4810,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
+ key.offset: 4813,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.argument,
+ key.offset: 4820,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 4826,
key.length: 1
},
{
- key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 4828,
- key.length: 1
- },
- {
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 4831,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 4838,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 4844,
- key.length: 1
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
- key.offset: 4847,
+ key.offset: 4829,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4859,
+ key.offset: 4841,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4864,
+ key.offset: 4846,
key.length: 29
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4901,
+ key.offset: 4883,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4907,
+ key.offset: 4889,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4912,
+ key.offset: 4894,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4933,
+ key.offset: 4915,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4938,
+ key.offset: 4920,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4958,
+ key.offset: 4940,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4968,
+ key.offset: 4950,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 4973,
+ key.offset: 4955,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 4993,
+ key.offset: 4975,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5003,
+ key.offset: 4985,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5008,
+ key.offset: 4990,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5029,
+ key.offset: 5011,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5039,
+ key.offset: 5021,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5044,
+ key.offset: 5026,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5064,
+ key.offset: 5046,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5071,
+ key.offset: 5053,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5081,
+ key.offset: 5063,
key.length: 13
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5097,
+ key.offset: 5079,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5103,
+ key.offset: 5085,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5107,
+ key.offset: 5089,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
+ key.offset: 5102,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5110,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5116,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 5120,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5128,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5134,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5138,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
+ key.offset: 5133,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5141,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5147,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 5151,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5159,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5165,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5169,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5182,
+ key.offset: 5164,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5190,
+ key.offset: 5172,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5196,
+ key.offset: 5178,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5200,
+ key.offset: 5182,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:s6UInt32V",
- key.offset: 5213,
+ key.offset: 5195,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5222,
+ key.offset: 5204,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5228,
+ key.offset: 5210,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5232,
+ key.offset: 5214,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt64",
key.usr: "s:s6UInt64V",
- key.offset: 5245,
+ key.offset: 5227,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5254,
+ key.offset: 5236,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5260,
+ key.offset: 5242,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5264,
+ key.offset: 5246,
key.length: 11
},
{
key.kind: source.lang.swift.ref.typealias,
key.name: "typedef_int_t",
key.usr: "c:Foo.h@T@typedef_int_t",
- key.offset: 5277,
+ key.offset: 5259,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5293,
+ key.offset: 5275,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5299,
+ key.offset: 5281,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5303,
+ key.offset: 5285,
key.length: 11
},
{
key.kind: source.lang.swift.ref.typealias,
key.name: "typedef_int_t",
key.usr: "c:Foo.h@T@typedef_int_t",
- key.offset: 5316,
+ key.offset: 5298,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5332,
+ key.offset: 5314,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5338,
+ key.offset: 5320,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5342,
+ key.offset: 5324,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int8",
key.usr: "s:s4Int8V",
- key.offset: 5355,
+ key.offset: 5337,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5362,
+ key.offset: 5344,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5368,
+ key.offset: 5350,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5372,
+ key.offset: 5354,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5385,
+ key.offset: 5367,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5393,
+ key.offset: 5375,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5399,
+ key.offset: 5381,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5403,
+ key.offset: 5385,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int16",
key.usr: "s:s5Int16V",
- key.offset: 5417,
+ key.offset: 5399,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5425,
+ key.offset: 5407,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5431,
+ key.offset: 5413,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5435,
+ key.offset: 5417,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
key.usr: "s:Si",
- key.offset: 5449,
+ key.offset: 5431,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5455,
+ key.offset: 5437,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5461,
+ key.offset: 5443,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5465,
+ key.offset: 5447,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5479,
+ key.offset: 5461,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5487,
+ key.offset: 5469,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5493,
+ key.offset: 5475,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5497,
+ key.offset: 5479,
key.length: 13
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5512,
+ key.offset: 5494,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5520,
+ key.offset: 5502,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5526,
+ key.offset: 5508,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5530,
+ key.offset: 5512,
key.length: 18
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt64",
key.usr: "s:s6UInt64V",
- key.offset: 5550,
+ key.offset: 5532,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5559,
+ key.offset: 5541,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5565,
+ key.offset: 5547,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5569,
+ key.offset: 5551,
key.length: 16
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:s6UInt32V",
- key.offset: 5587,
+ key.offset: 5569,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5596,
+ key.offset: 5578,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5602,
+ key.offset: 5584,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5606,
+ key.offset: 5588,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
+ key.offset: 5607,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5615,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5621,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 5625,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5633,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5639,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5643,
key.length: 17
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5662,
+ key.offset: 5644,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5670,
+ key.offset: 5652,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5676,
+ key.offset: 5658,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5681,
+ key.offset: 5663,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5700,
+ key.offset: 5682,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5705,
+ key.offset: 5687,
key.length: 21
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5729,
+ key.offset: 5711,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5736,
+ key.offset: 5718,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 5741,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 5745,
+ key.length: 1
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "Int32",
+ key.usr: "s:s5Int32V",
+ key.offset: 5748,
+ key.length: 5
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 5759,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5763,
- key.length: 1
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "Int32",
- key.usr: "s:s5Int32V",
- key.offset: 5766,
- key.length: 5
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5777,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5789,
+ key.offset: 5771,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 5794,
+ key.offset: 5776,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 5796,
+ key.offset: 5778,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 5799,
+ key.offset: 5781,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5808,
+ key.offset: 5790,
key.length: 9
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 5818,
+ key.offset: 5800,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5838,
+ key.offset: 5820,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5843,
+ key.offset: 5825,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5863,
+ key.offset: 5845,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5870,
+ key.offset: 5852,
key.length: 9
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 5880,
+ key.offset: 5862,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5900,
+ key.offset: 5882,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5905,
+ key.offset: 5887,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5925,
+ key.offset: 5907,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5935,
+ key.offset: 5917,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 5940,
+ key.offset: 5922,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5961,
+ key.offset: 5943,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5968,
+ key.offset: 5950,
key.length: 9
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 5978,
+ key.offset: 5960,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 5998,
+ key.offset: 5980,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6003,
+ key.offset: 5985,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6023,
+ key.offset: 6005,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6030,
+ key.offset: 6012,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6039,
+ key.offset: 6021,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6057,
+ key.offset: 6039,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6063,
+ key.offset: 6045,
key.length: 21
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "_InternalProt",
key.usr: "c:objc(pl)_InternalProt",
- key.offset: 6087,
+ key.offset: 6069,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6105,
+ key.offset: 6087,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6111,
+ key.offset: 6093,
key.length: 25
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 6139,
+ key.offset: 6121,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 6159,
+ key.offset: 6141,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6175,
+ key.offset: 6157,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6179,
+ key.offset: 6161,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
- key.offset: 6191,
+ key.offset: 6173,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 6207,
+ key.offset: 6189,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6223,
+ key.offset: 6205,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6227,
+ key.offset: 6209,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
- key.offset: 6245,
+ key.offset: 6227,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6261,
+ key.offset: 6243,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6265,
+ key.offset: 6247,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6277,
+ key.offset: 6259,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6287,
+ key.offset: 6269,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6291,
+ key.offset: 6273,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6302,
+ key.offset: 6284,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6312,
+ key.offset: 6294,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6316,
+ key.offset: 6298,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6326,
+ key.offset: 6308,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 6336,
+ key.offset: 6318,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6341,
+ key.offset: 6323,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6345,
+ key.offset: 6327,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
- key.offset: 6354,
+ key.offset: 6336,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6370,
+ key.offset: 6352,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6374,
+ key.offset: 6356,
key.length: 6
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 6382,
+ key.offset: 6364,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6393,
+ key.offset: 6375,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6398,
+ key.offset: 6380,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6418,
+ key.offset: 6400,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6428,
+ key.offset: 6410,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6433,
+ key.offset: 6415,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6453,
+ key.offset: 6435,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6463,
+ key.offset: 6445,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6468,
+ key.offset: 6450,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6489,
+ key.offset: 6471,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6499,
+ key.offset: 6481,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6504,
+ key.offset: 6486,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6524,
+ key.offset: 6506,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6531,
+ key.offset: 6513,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6535,
+ key.offset: 6517,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6547,
+ key.offset: 6529,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6553,
+ key.offset: 6535,
key.length: 21
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 6577,
+ key.offset: 6559,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
- key.offset: 6597,
+ key.offset: 6579,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6609,
+ key.offset: 6591,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 6615,
+ key.offset: 6597,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 6619,
+ key.offset: 6601,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 6622,
+ key.offset: 6604,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6634,
+ key.offset: 6616,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6639,
+ key.offset: 6621,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6658,
+ key.offset: 6640,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6663,
+ key.offset: 6645,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6687,
+ key.offset: 6669,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6692,
+ key.offset: 6674,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6710,
+ key.offset: 6692,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6715,
+ key.offset: 6697,
key.length: 22
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6745,
+ key.offset: 6727,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6750,
+ key.offset: 6732,
key.length: 22
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6780,
+ key.offset: 6762,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6785,
+ key.offset: 6767,
key.length: 21
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6814,
+ key.offset: 6796,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6819,
+ key.offset: 6801,
key.length: 23
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6850,
+ key.offset: 6832,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6855,
+ key.offset: 6837,
key.length: 25
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6888,
+ key.offset: 6870,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6893,
+ key.offset: 6875,
key.length: 25
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6926,
+ key.offset: 6908,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6931,
+ key.offset: 6913,
key.length: 24
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 6963,
+ key.offset: 6945,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 6968,
+ key.offset: 6950,
key.length: 26
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7002,
+ key.offset: 6984,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7007,
+ key.offset: 6989,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7027,
+ key.offset: 7009,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7037,
+ key.offset: 7019,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7042,
+ key.offset: 7024,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7062,
+ key.offset: 7044,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7072,
+ key.offset: 7054,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7077,
+ key.offset: 7059,
key.length: 15
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7098,
+ key.offset: 7080,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7108,
+ key.offset: 7090,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7113,
+ key.offset: 7095,
key.length: 14
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7133,
+ key.offset: 7115,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7140,
+ key.offset: 7122,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7146,
+ key.offset: 7128,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7160,
+ key.offset: 7142,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7165,
+ key.offset: 7147,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7182,
+ key.offset: 7164,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7184,
+ key.offset: 7166,
key.length: 1
},
{
key.kind: source.lang.swift.ref.class,
key.name: "FooCFType",
key.usr: "c:Foo.h@T@FooCFTypeRef",
- key.offset: 7187,
+ key.offset: 7169,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7199,
+ key.offset: 7181,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7204,
+ key.offset: 7186,
key.length: 21
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
key.usr: "s:Si",
- key.offset: 7228,
+ key.offset: 7210,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7239,
+ key.offset: 7221,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7244,
+ key.offset: 7226,
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7263,
+ key.offset: 7245,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7268,
+ key.offset: 7250,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7284,
+ key.offset: 7266,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7291,
+ key.offset: 7273,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7300,
+ key.offset: 7282,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7302,
+ key.offset: 7284,
key.length: 3
},
{
key.kind: source.lang.swift.ref.enum,
key.name: "ABAuthorizationStatus",
key.usr: "c:@E@ABAuthorizationStatus",
- key.offset: 7307,
+ key.offset: 7289,
key.length: 21
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7330,
+ key.offset: 7312,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7332,
+ key.offset: 7314,
key.length: 3
},
{
key.kind: source.lang.swift.ref.enum,
key.name: "ABAuthorizationStatus",
key.usr: "c:@E@ABAuthorizationStatus",
- key.offset: 7337,
+ key.offset: 7319,
key.length: 21
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 7363,
+ key.offset: 7345,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7370,
+ key.offset: 7352,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7375,
+ key.offset: 7357,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7387,
+ key.offset: 7369,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7389,
+ key.offset: 7371,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 7392,
+ key.offset: 7374,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:s5Int32V",
- key.offset: 7402,
+ key.offset: 7384,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7408,
+ key.offset: 7390,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7415,
+ key.offset: 7397,
key.length: 11
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "Equatable",
key.usr: "s:s9EquatableP",
- key.offset: 7429,
+ key.offset: 7411,
key.length: 9
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "RawRepresentable",
key.usr: "s:s16RawRepresentableP",
- key.offset: 7440,
+ key.offset: 7422,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7464,
+ key.offset: 7446,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7469,
+ key.offset: 7451,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7471,
+ key.offset: 7453,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:s6UInt32V",
- key.offset: 7481,
+ key.offset: 7463,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7494,
+ key.offset: 7476,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7499,
+ key.offset: 7481,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7508,
+ key.offset: 7490,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:s6UInt32V",
- key.offset: 7518,
+ key.offset: 7500,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7531,
+ key.offset: 7513,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7535,
+ key.offset: 7517,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:s6UInt32V",
- key.offset: 7545,
+ key.offset: 7527,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7557,
+ key.offset: 7539,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7564,
+ key.offset: 7546,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7573,
+ key.offset: 7555,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7575,
+ key.offset: 7557,
key.length: 3
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
- key.offset: 7580,
+ key.offset: 7562,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.argument,
- key.offset: 7593,
+ key.offset: 7575,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
- key.offset: 7595,
+ key.offset: 7577,
key.length: 3
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
- key.offset: 7600,
+ key.offset: 7582,
key.length: 11
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Bool",
key.usr: "s:Sb",
- key.offset: 7616,
+ key.offset: 7598,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 7605,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.identifier,
+ key.offset: 7609,
+ key.length: 12
+ },
+ {
+ key.kind: source.lang.swift.ref.struct,
+ key.name: "FooSubEnum1",
+ key.usr: "c:@E@FooSubEnum1",
key.offset: 7623,
+ key.length: 11
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 7637,
+ key.length: 3
+ },
+ {
+ key.kind: source.lang.swift.syntaxtype.keyword,
+ key.offset: 7643,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7627,
+ key.offset: 7647,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
- key.offset: 7641,
- key.length: 11
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7655,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 7661,
- key.length: 3
- },
- {
- key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7665,
- key.length: 12
- },
- {
- key.kind: source.lang.swift.ref.struct,
- key.name: "FooSubEnum1",
- key.usr: "c:@E@FooSubEnum1",
- key.offset: 7679,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7693,
+ key.offset: 7675,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7699,
+ key.offset: 7681,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
- key.offset: 7703,
+ key.offset: 7685,
key.length: 25
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
key.usr: "s:Si",
- key.offset: 7730,
+ key.offset: 7712,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
- key.offset: 7736,
+ key.offset: 7718,
key.length: 3
}
]
@@ -5076,7 +5069,7 @@
key.kind: source.lang.swift.decl.extension.struct,
key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions</Declaration><CommentParts><Abstract><Para><codeVoice>SetAlgebra</codeVoice> requirements for which default implementations are supplied.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>SetAlgebra</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note></Discussion></CommentParts></Other>",
key.offset: 1350,
- key.length: 588,
+ key.length: 570,
key.extends: {
key.kind: source.lang.swift.ref.struct,
key.name: "FooRuncingOptions",
@@ -5103,8 +5096,8 @@
],
key.doc.full_as_xml: "<Function><Name>init(_:)</Name><USR>s:s10SetAlgebraPsEyxqd__cs8SequenceRd__7ElementQyd__ADRtzlufc</USR><Declaration>convenience init<S>(_ sequence: S) where S : Sequence, Self.Element == S.Element</Declaration><CommentParts><Abstract><Para>Creates a new set from a finite sequence of items.</Para></Abstract><Parameters><Parameter><Name>sequence</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>The elements to use as members of the new set.</Para></Discussion></Parameter></Parameters><Discussion><Para>Use this initializer to create a new set from an existing sequence, like an array or a range:</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let validIndices = Set(0..<7).subtracting([2, 4, 5])]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(validIndices)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"[6, 0, 1, 3]\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
key.offset: 1385,
- key.length: 93,
- key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>convenience</syntaxtype.keyword> <syntaxtype.keyword>init</syntaxtype.keyword><S>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>sequence</decl.var.parameter.name>: <decl.var.parameter.type>S</decl.var.parameter.type></decl.var.parameter>) <syntaxtype.keyword>where</syntaxtype.keyword> <decl.generic_type_requirement>S : <ref.protocol usr=\"s:s8SequenceP\">Sequence</ref.protocol></decl.generic_type_requirement>, <decl.generic_type_requirement><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct>.<ref.typealias usr=\"s:So17FooRuncingOptionsV7Elementa\">Element</ref.typealias> == S.Element</decl.generic_type_requirement></decl.function.constructor>",
+ key.length: 75,
+ key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>convenience</syntaxtype.keyword> <syntaxtype.keyword>init</syntaxtype.keyword><S>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>sequence</decl.var.parameter.name>: <decl.var.parameter.type>S</decl.var.parameter.type></decl.var.parameter>) <syntaxtype.keyword>where</syntaxtype.keyword> <decl.generic_type_requirement>S : <ref.protocol usr=\"s:s8SequenceP\">Sequence</ref.protocol></decl.generic_type_requirement>, <decl.generic_type_requirement><ref.typealias usr=\"s:So17FooRuncingOptionsV7Elementa\">Element</ref.typealias> == S.Element</decl.generic_type_requirement></decl.function.constructor>",
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
@@ -5121,7 +5114,7 @@
key.usr: "s:s10SetAlgebraPsE8subtractyyxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE8subtractyyxF",
key.doc.full_as_xml: "<Function><Name>subtract(_:)</Name><USR>s:s10SetAlgebraPsE8subtractyyxF</USR><Declaration>mutating func subtract(_ other: Self)</Declaration><CommentParts><Abstract><Para>Removes the elements of the given set from this set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><Discussion><Para>In the following example, the elements of the <codeVoice>employees</codeVoice> set that are also members of the <codeVoice>neighbors</codeVoice> set are removed. In particular, the names <codeVoice>"Bethany"</codeVoice> and <codeVoice>"Eric"</codeVoice> are removed from <codeVoice>employees</codeVoice>.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[var employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let neighbors: Set = [\"Bethany\", \"Eric\", \"Forlani\", \"Greta\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[employees.subtract(neighbors)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(employees)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"[\"Diana\", \"Chris\", \"Alicia\"]\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1484,
+ key.offset: 1466,
key.length: 50,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>subtract</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -5129,7 +5122,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 1516,
+ key.offset: 1498,
key.length: 17
}
]
@@ -5140,7 +5133,7 @@
key.usr: "s:s10SetAlgebraPsE8isSubset2ofSbx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE8isSubset2ofSbx_tF",
key.doc.full_as_xml: "<Function><Name>isSubset(of:)</Name><USR>s:s10SetAlgebraPsE8isSubset2ofSbx_tF</USR><Declaration>func isSubset(of other: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether the set is a subset of another set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the set is a subset of <codeVoice>other</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>Set <emphasis>A</emphasis> is a subset of another set <emphasis>B</emphasis> if every member of <emphasis>A</emphasis> is also a member of <emphasis>B</emphasis>.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let attendees: Set = [\"Alicia\", \"Bethany\", \"Diana\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(attendees.isSubset(of: employees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1540,
+ key.offset: 1522,
key.length: 50,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>isSubset</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>of</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5148,7 +5141,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "of",
key.name: "other",
- key.offset: 1564,
+ key.offset: 1546,
key.length: 17
}
]
@@ -5159,7 +5152,7 @@
key.usr: "s:s10SetAlgebraPsE10isSuperset2ofSbx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE10isSuperset2ofSbx_tF",
key.doc.full_as_xml: "<Function><Name>isSuperset(of:)</Name><USR>s:s10SetAlgebraPsE10isSuperset2ofSbx_tF</USR><Declaration>func isSuperset(of other: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether the set is a superset of the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the set is a superset of <codeVoice>other</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>Set <emphasis>A</emphasis> is a superset of another set <emphasis>B</emphasis> if every member of <emphasis>B</emphasis> is also a member of <emphasis>A</emphasis>.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let attendees: Set = [\"Alicia\", \"Bethany\", \"Diana\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(employees.isSuperset(of: attendees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1596,
+ key.offset: 1578,
key.length: 52,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>isSuperset</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>of</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5167,7 +5160,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "of",
key.name: "other",
- key.offset: 1622,
+ key.offset: 1604,
key.length: 17
}
]
@@ -5178,7 +5171,7 @@
key.usr: "s:s10SetAlgebraPsE10isDisjoint4withSbx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE10isDisjoint4withSbx_tF",
key.doc.full_as_xml: "<Function><Name>isDisjoint(with:)</Name><USR>s:s10SetAlgebraPsE10isDisjoint4withSbx_tF</USR><Declaration>func isDisjoint(with other: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether the set has no members in common with the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the set has no elements in common with <codeVoice>other</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>In the following example, the <codeVoice>employees</codeVoice> set is disjoint with the <codeVoice>visitors</codeVoice> set because no name appears in both sets.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let visitors: Set = [\"Marcia\", \"Nathaniel\", \"Olivia\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(employees.isDisjoint(with: visitors))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1654,
+ key.offset: 1636,
key.length: 54,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>isDisjoint</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>with</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5186,7 +5179,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "with",
key.name: "other",
- key.offset: 1682,
+ key.offset: 1664,
key.length: 17
}
]
@@ -5197,7 +5190,7 @@
key.usr: "s:s10SetAlgebraPsE11subtractingyxxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE11subtractingyxxF",
key.doc.full_as_xml: "<Function><Name>subtracting(_:)</Name><USR>s:s10SetAlgebraPsE11subtractingyxxF</USR><Declaration>func subtracting(_ other: Self) -> Self</Declaration><CommentParts><Abstract><Para>Returns a new set containing the elements of this set that do not occur in the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para>A new set.</Para></ResultDiscussion><Discussion><Para>In the following example, the <codeVoice>nonNeighbors</codeVoice> set is made up of the elements of the <codeVoice>employees</codeVoice> set that are not elements of <codeVoice>neighbors</codeVoice>:</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let neighbors: Set = [\"Bethany\", \"Eric\", \"Forlani\", \"Greta\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let nonNeighbors = employees.subtract(neighbors)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(nonNeighbors)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"[\"Diana\", \"Chris\", \"Alicia\"]\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1714,
+ key.offset: 1696,
key.length: 65,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>subtracting</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5205,7 +5198,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 1740,
+ key.offset: 1722,
key.length: 17
}
]
@@ -5216,7 +5209,7 @@
key.usr: "s:s10SetAlgebraPsE7isEmptySbvp::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE7isEmptySbvp",
key.doc.full_as_xml: "<Other><Name>isEmpty</Name><USR>s:s10SetAlgebraPsE7isEmptySbvp</USR><Declaration>var isEmpty: Bool { get }</Declaration><CommentParts><Abstract><Para>A Boolean value that indicates whether the set has no elements.</Para></Abstract></CommentParts></Other>",
- key.offset: 1785,
+ key.offset: 1767,
key.length: 25,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>isEmpty</decl.name>: <decl.var.type><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -5226,7 +5219,7 @@
key.usr: "s:s10SetAlgebraPsE16isStrictSuperset2ofSbx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE16isStrictSuperset2ofSbx_tF",
key.doc.full_as_xml: "<Function><Name>isStrictSuperset(of:)</Name><USR>s:s10SetAlgebraPsE16isStrictSuperset2ofSbx_tF</USR><Declaration>func isStrictSuperset(of other: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether this set is a strict superset of the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the set is a strict superset of <codeVoice>other</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>Set <emphasis>A</emphasis> is a strict superset of another set <emphasis>B</emphasis> if every member of <emphasis>B</emphasis> is also a member of <emphasis>A</emphasis> and <emphasis>A</emphasis> contains at least one element that is <emphasis>not</emphasis> a member of <emphasis>B</emphasis>.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let attendees: Set = [\"Alicia\", \"Bethany\", \"Diana\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(employees.isStrictSuperset(of: attendees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// A set is never a strict superset of itself:]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(employees.isStrictSuperset(of: employees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"false\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1816,
+ key.offset: 1798,
key.length: 58,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>isStrictSuperset</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>of</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5234,7 +5227,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "of",
key.name: "other",
- key.offset: 1848,
+ key.offset: 1830,
key.length: 17
}
]
@@ -5245,7 +5238,7 @@
key.usr: "s:s10SetAlgebraPsE14isStrictSubset2ofSbx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s10SetAlgebraPsE14isStrictSubset2ofSbx_tF",
key.doc.full_as_xml: "<Function><Name>isStrictSubset(of:)</Name><USR>s:s10SetAlgebraPsE14isStrictSubset2ofSbx_tF</USR><Declaration>func isStrictSubset(of other: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether this set is a strict subset of the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A set of the same type as the current set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the set is a strict subset of <codeVoice>other</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>Set <emphasis>A</emphasis> is a strict subset of another set <emphasis>B</emphasis> if every member of <emphasis>A</emphasis> is also a member of <emphasis>B</emphasis> and <emphasis>B</emphasis> contains at least one element that is not a member of <emphasis>A</emphasis>.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let employees: Set = [\"Alicia\", \"Bethany\", \"Chris\", \"Diana\", \"Eric\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let attendees: Set = [\"Alicia\", \"Bethany\", \"Diana\"]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(attendees.isStrictSubset(of: employees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// A set is never a strict subset of itself:]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(attendees.isStrictSubset(of: attendees))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"false\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1880,
+ key.offset: 1862,
key.length: 56,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>isStrictSubset</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>of</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5253,7 +5246,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "of",
key.name: "other",
- key.offset: 1910,
+ key.offset: 1892,
key.length: 17
}
]
@@ -5263,7 +5256,7 @@
{
key.kind: source.lang.swift.decl.extension.struct,
key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions</Declaration><CommentParts><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note></Discussion></CommentParts></Other>",
- key.offset: 1940,
+ key.offset: 1922,
key.length: 247,
key.extends: {
key.kind: source.lang.swift.ref.struct,
@@ -5277,7 +5270,7 @@
key.usr: "s:s9OptionSetPsE5unionyxxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPsE5unionyxxF",
key.doc.full_as_xml: "<Function><Name>union(_:)</Name><USR>s:s9OptionSetPsE5unionyxxF</USR><Declaration>func union(_ other: Self) -> Self</Declaration><CommentParts><Abstract><Para>Returns a new option set of the elements contained in this set, in the given set, or in both.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para>A new option set made up of the elements contained in this set, in <codeVoice>other</codeVoice>, or in both.</Para></ResultDiscussion><Discussion><Para>This example uses the <codeVoice>union(_:)</codeVoice> method to add two more shipping options to the default set.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let defaultShipping = ShippingOptions.standard]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let memberShipping = defaultShipping.union([.secondDay, .priority])]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(memberShipping.contains(.priority))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 1975,
+ key.offset: 1957,
key.length: 59,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>union</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5285,7 +5278,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 1995,
+ key.offset: 1977,
key.length: 17
}
]
@@ -5296,7 +5289,7 @@
key.usr: "s:s9OptionSetPsE12intersectionyxxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPsE12intersectionyxxF",
key.doc.full_as_xml: "<Function><Name>intersection(_:)</Name><USR>s:s9OptionSetPsE12intersectionyxxF</USR><Declaration>func intersection(_ other: Self) -> Self</Declaration><CommentParts><Abstract><Para>Returns a new option set with only the elements contained in both this set and the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para>A new option set with only the elements contained in both this set and <codeVoice>other</codeVoice>.</Para></ResultDiscussion><Discussion><Para>This example uses the <codeVoice>intersection(_:)</codeVoice> method to limit the available shipping options to what can be used with a PO Box destination.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[// Can only ship standard or priority to PO Boxes]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let poboxShipping: ShippingOptions = [.standard, .priority]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let memberShipping: ShippingOptions =]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[ [.standard, .priority, .secondDay]]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let availableOptions = memberShipping.intersection(poboxShipping)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(availableOptions.contains(.priority))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(availableOptions.contains(.secondDay))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"false\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 2040,
+ key.offset: 2022,
key.length: 66,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>intersection</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5304,7 +5297,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 2067,
+ key.offset: 2049,
key.length: 17
}
]
@@ -5315,7 +5308,7 @@
key.usr: "s:s9OptionSetPsE19symmetricDifferenceyxxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPsE19symmetricDifferenceyxxF",
key.doc.full_as_xml: "<Function><Name>symmetricDifference(_:)</Name><USR>s:s9OptionSetPsE19symmetricDifferenceyxxF</USR><Declaration>func symmetricDifference(_ other: Self) -> Self</Declaration><CommentParts><Abstract><Para>Returns a new option set with the elements contained in this set or in the given set, but not in both.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para>A new option set with only the elements contained in either this set or <codeVoice>other</codeVoice>, but not in both.</Para></ResultDiscussion></CommentParts></Function>",
- key.offset: 2112,
+ key.offset: 2094,
key.length: 73,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>symmetricDifference</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5323,7 +5316,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 2146,
+ key.offset: 2128,
key.length: 17
}
]
@@ -5338,7 +5331,7 @@
}
],
key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions where Self == Self.Element</Declaration><CommentParts><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied when <codeVoice>Element == Self</codeVoice>, which is the default.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note></Discussion></CommentParts></Other>",
- key.offset: 2189,
+ key.offset: 2171,
key.length: 363,
key.extends: {
key.kind: source.lang.swift.ref.struct,
@@ -5352,7 +5345,7 @@
key.usr: "s:s9OptionSetPs7ElementQzRszrlE8containsySbxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPs7ElementQzRszrlE8containsySbxF",
key.doc.full_as_xml: "<Function><Name>contains(_:)</Name><USR>s:s9OptionSetPs7ElementQzRszrlE8containsySbxF</USR><Declaration>func contains(_ member: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value that indicates whether a given element is a member of the option set.</Para></Abstract><Parameters><Parameter><Name>member</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>The element to look for in the option set.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>true</codeVoice> if the option set contains <codeVoice>member</codeVoice>; otherwise, <codeVoice>false</codeVoice>.</Para></ResultDiscussion><Discussion><Para>This example uses the <codeVoice>contains(_:)</codeVoice> method to check whether next-day shipping is in the <codeVoice>availableOptions</codeVoice> instance.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let availableOptions = ShippingOptions.express]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[if availableOptions.contains(.nextDay) {]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[ print(\"Next day shipping available\")]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[}]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"Next day shipping available\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 2224,
+ key.offset: 2206,
key.length: 50,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>contains</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>member</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5360,7 +5353,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "member",
- key.offset: 2248,
+ key.offset: 2230,
key.length: 17
}
]
@@ -5371,7 +5364,7 @@
key.usr: "s:s9OptionSetPs7ElementQzRszrlE6insertySb8inserted_x17memberAfterInserttxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPs7ElementQzRszrlE6insertySb8inserted_x17memberAfterInserttxF",
key.doc.full_as_xml: "<Function><Name>insert(_:)</Name><USR>s:s9OptionSetPs7ElementQzRszrlE6insertySb8inserted_x17memberAfterInserttxF</USR><Declaration>mutating func insert(_ newMember: Self.Element) -> (inserted: Bool, memberAfterInsert: Self.Element)</Declaration><CommentParts><Abstract><Para>Adds the given element to the option set if it is not already a member.</Para></Abstract><Parameters><Parameter><Name>newMember</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>The element to insert.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para><codeVoice>(true, newMember)</codeVoice> if <codeVoice>newMember</codeVoice> was not contained in <codeVoice>self</codeVoice>. Otherwise, returns <codeVoice>(false, oldMember)</codeVoice>, where <codeVoice>oldMember</codeVoice> is the member of the set equal to <codeVoice>newMember</codeVoice>.</Para></ResultDiscussion><Discussion><Para>In the following example, the <codeVoice>.secondDay</codeVoice> shipping option is added to the <codeVoice>freeOptions</codeVoice> option set if <codeVoice>purchasePrice</codeVoice> is greater than 50.0. For the <codeVoice>ShippingOptions</codeVoice> declaration, see the <codeVoice>OptionSet</codeVoice> protocol discussion.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let purchasePrice = 87.55]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered><zCodeLineNumbered><![CDATA[var freeOptions: ShippingOptions = [.standard, .priority]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[if purchasePrice > 50 {]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[ freeOptions.insert(.secondDay)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[}]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(freeOptions.contains(.secondDay))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 2280,
+ key.offset: 2262,
key.length: 110,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@discardableResult</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>insert</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>newMember</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><tuple>(<tuple.element><tuple.element.argument_label>inserted</tuple.element.argument_label>: <tuple.element.type><ref.struct usr=\"s:Sb\">Bool</ref.struct></tuple.element.type></tuple.element>, <tuple.element><tuple.element.argument_label>memberAfterInsert</tuple.element.argument_label>: <tuple.element.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></tuple.element.type></tuple.element>)</tuple></decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5379,7 +5372,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "newMember",
- key.offset: 2314,
+ key.offset: 2296,
key.length: 17
}
]
@@ -5390,7 +5383,7 @@
key.usr: "s:s9OptionSetPs7ElementQzRszrlE6removeyxSgxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPs7ElementQzRszrlE6removeyxSgxF",
key.doc.full_as_xml: "<Function><Name>remove(_:)</Name><USR>s:s9OptionSetPs7ElementQzRszrlE6removeyxSgxF</USR><Declaration>mutating func remove(_ member: Self.Element) -> Self.Element?</Declaration><CommentParts><Abstract><Para>Removes the given element and all elements subsumed by it.</Para></Abstract><Parameters><Parameter><Name>member</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>The element of the set to remove.</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para>The intersection of <codeVoice>[member]</codeVoice> and the set, if the intersection was nonempty; otherwise, <codeVoice>nil</codeVoice>.</Para></ResultDiscussion><Discussion><Para>In the following example, the <codeVoice>.priority</codeVoice> shipping option is removed from the <codeVoice>options</codeVoice> option set. Attempting to remove the same shipping option a second time results in <codeVoice>nil</codeVoice>, because <codeVoice>options</codeVoice> no longer contains <codeVoice>.priority</codeVoice> as a member.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[var options: ShippingOptions = [.secondDay, .priority]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let priorityOption = options.remove(.priority)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(priorityOption == .priority)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(options.remove(.priority))]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"nil\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing><Para>In the next example, the <codeVoice>.express</codeVoice> element is passed to <codeVoice>remove(_:)</codeVoice>. Although <codeVoice>.express</codeVoice> is not a member of <codeVoice>options</codeVoice>, <codeVoice>.express</codeVoice> subsumes the remaining <codeVoice>.secondDay</codeVoice> element of the option set. Therefore, <codeVoice>options</codeVoice> is emptied and the intersection between <codeVoice>.express</codeVoice> and <codeVoice>options</codeVoice> is returned.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[let expressOption = options.remove(.express)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(expressOption == .express)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"false\"]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(expressOption == .secondDay)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 2396,
+ key.offset: 2378,
key.length: 71,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@discardableResult</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>remove</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>member</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct>?</decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5398,7 +5391,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "member",
- key.offset: 2427,
+ key.offset: 2409,
key.length: 17
}
]
@@ -5409,7 +5402,7 @@
key.usr: "s:s9OptionSetPs7ElementQzRszrlE6update4withxSgx_tF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPs7ElementQzRszrlE6update4withxSgx_tF",
key.doc.full_as_xml: "<Function><Name>update(with:)</Name><USR>s:s9OptionSetPs7ElementQzRszrlE6update4withxSgx_tF</USR><Declaration>mutating func update(with newMember: Self.Element) -> Self.Element?</Declaration><CommentParts><Abstract><Para>Inserts the given element into the set.</Para></Abstract><ResultDiscussion><Para>The intersection of <codeVoice>[newMember]</codeVoice> and the set if the intersection was nonempty; otherwise, <codeVoice>nil</codeVoice>.</Para></ResultDiscussion><Discussion><Para>If <codeVoice>newMember</codeVoice> is not contained in the set but subsumes current members of the set, the subsumed members are returned.</Para><CodeListing language=\"swift\"><zCodeLineNumbered><![CDATA[var options: ShippingOptions = [.secondDay, .priority]]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[let replaced = options.update(with: .express)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[print(replaced == .secondDay)]]></zCodeLineNumbered><zCodeLineNumbered><![CDATA[// Prints \"true\"]]></zCodeLineNumbered><zCodeLineNumbered></zCodeLineNumbered></CodeListing></Discussion></CommentParts></Function>",
- key.offset: 2473,
+ key.offset: 2455,
key.length: 77,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@discardableResult</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>update</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>with</decl.var.parameter.argument_label> <decl.var.parameter.name>newMember</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct>?</decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -5417,7 +5410,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "with",
key.name: "newMember",
- key.offset: 2510,
+ key.offset: 2492,
key.length: 17
}
]
@@ -5432,7 +5425,7 @@
}
],
key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions where Self.RawValue : FixedWidthInteger</Declaration><CommentParts><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied when <codeVoice>RawValue</codeVoice> conforms to <codeVoice>FixedWidthInteger</codeVoice>, which is the usual case. Each distinct bit of an option set’s <codeVoice>.rawValue</codeVoice> corresponds to a disjoint value of the <codeVoice>OptionSet</codeVoice>.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note><List-Bullet><Item><Para><codeVoice>union</codeVoice> is implemented as a bitwise “or” (<codeVoice>|</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>intersection</codeVoice> is implemented as a bitwise “and” (<codeVoice>&</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item><Item><Para><codeVoice>symmetricDifference</codeVoice> is implemented as a bitwise “exclusive or” (<codeVoice>^</codeVoice>) of <codeVoice>rawValue</codeVoice>s</Para></Item></List-Bullet></Discussion></CommentParts></Other>",
- key.offset: 2554,
+ key.offset: 2536,
key.length: 247,
key.extends: {
key.kind: source.lang.swift.ref.struct,
@@ -5446,7 +5439,7 @@
key.usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlExycfc::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlExycfc",
key.doc.full_as_xml: "<Function><Name>init()</Name><USR>s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlExycfc</USR><Declaration>convenience init()</Declaration><CommentParts><Abstract><Para>Creates an empty option set.</Para></Abstract><Discussion><Para>This initializer creates an option set with a raw value of zero.</Para></Discussion></CommentParts></Function>",
- key.offset: 2589,
+ key.offset: 2571,
key.length: 18,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>convenience</syntaxtype.keyword> <syntaxtype.keyword>init</syntaxtype.keyword>()</decl.function.constructor>"
},
@@ -5456,7 +5449,7 @@
key.usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE9formUnionyyxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE9formUnionyyxF",
key.doc.full_as_xml: "<Function><Name>formUnion(_:)</Name><USR>s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE9formUnionyyxF</USR><Declaration>mutating func formUnion(_ other: Self)</Declaration><CommentParts><Abstract><Para>Inserts the elements of another set into this option set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><Discussion><Para>This method is implemented as a <codeVoice>|</codeVoice> (bitwise OR) operation on the two sets’ raw values.</Para></Discussion></CommentParts></Function>",
- key.offset: 2613,
+ key.offset: 2595,
key.length: 51,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>formUnion</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -5464,7 +5457,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 2646,
+ key.offset: 2628,
key.length: 17
}
]
@@ -5475,7 +5468,7 @@
key.usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE16formIntersectionyyxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE16formIntersectionyyxF",
key.doc.full_as_xml: "<Function><Name>formIntersection(_:)</Name><USR>s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE16formIntersectionyyxF</USR><Declaration>mutating func formIntersection(_ other: Self)</Declaration><CommentParts><Abstract><Para>Removes all elements of this option set that are not also present in the given set.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><Discussion><Para>This method is implemented as a <codeVoice>&</codeVoice> (bitwise AND) operation on the two sets’ raw values.</Para></Discussion></CommentParts></Function>",
- key.offset: 2670,
+ key.offset: 2652,
key.length: 58,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>formIntersection</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -5483,7 +5476,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 2710,
+ key.offset: 2692,
key.length: 17
}
]
@@ -5494,7 +5487,7 @@
key.usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE23formSymmetricDifferenceyyxF::SYNTHESIZED::c:@E@FooRuncingOptions",
key.original_usr: "s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE23formSymmetricDifferenceyyxF",
key.doc.full_as_xml: "<Function><Name>formSymmetricDifference(_:)</Name><USR>s:s9OptionSetPss17FixedWidthInteger8RawValueRpzrlE23formSymmetricDifferenceyyxF</USR><Declaration>mutating func formSymmetricDifference(_ other: Self)</Declaration><CommentParts><Abstract><Para>Replaces this set with a new set containing all elements contained in either this set or the given set, but not in both.</Para></Abstract><Parameters><Parameter><Name>other</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>An option set.</Para></Discussion></Parameter></Parameters><Discussion><Para>This method is implemented as a <codeVoice>^</codeVoice> (bitwise XOR) operation on the two sets’ raw values.</Para></Discussion></CommentParts></Function>",
- key.offset: 2734,
+ key.offset: 2716,
key.length: 65,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>mutating</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>formSymmetricDifference</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>other</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooRuncingOptions\">FooRuncingOptions</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -5502,7 +5495,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "other",
- key.offset: 2781,
+ key.offset: 2763,
key.length: 17
}
]
@@ -5513,7 +5506,7 @@
key.kind: source.lang.swift.decl.struct,
key.name: "FooStruct1",
key.usr: "c:@S@FooStruct1",
- key.offset: 2802,
+ key.offset: 2784,
key.length: 105,
key.fully_annotated_decl: "<decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>FooStruct1</decl.name></decl.struct>",
key.entities: [
@@ -5521,7 +5514,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "x",
key.usr: "c:@S@FooStruct1@FI@x",
- key.offset: 2827,
+ key.offset: 2809,
key.length: 12,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>x</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5529,7 +5522,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "y",
key.usr: "c:@S@FooStruct1@FI@y",
- key.offset: 2845,
+ key.offset: 2827,
key.length: 13,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>y</decl.name>: <decl.var.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5537,7 +5530,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init()",
key.usr: "s:So10FooStruct1VABycfc",
- key.offset: 2864,
+ key.offset: 2846,
key.length: 6,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>()</decl.function.constructor>"
},
@@ -5545,7 +5538,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(x:y:)",
key.usr: "s:So10FooStruct1V1x1yABs5Int32V_Sdtcfc",
- key.offset: 2876,
+ key.offset: 2858,
key.length: 29,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>y</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -5553,14 +5546,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "x",
key.name: "x",
- key.offset: 2886,
+ key.offset: 2868,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "y",
key.name: "y",
- key.offset: 2898,
+ key.offset: 2880,
key.length: 6
}
]
@@ -5571,7 +5564,7 @@
key.kind: source.lang.swift.decl.typealias,
key.name: "FooStruct1Pointer",
key.usr: "c:Foo.h@T@FooStruct1Pointer",
- key.offset: 2908,
+ key.offset: 2890,
key.length: 62,
key.fully_annotated_decl: "<decl.typealias><syntaxtype.keyword>typealias</syntaxtype.keyword> <decl.name>FooStruct1Pointer</decl.name> = <ref.struct usr=\"s:Sp\">UnsafeMutablePointer</ref.struct><<ref.struct usr=\"c:@S@FooStruct1\">FooStruct1</ref.struct>></decl.typealias>",
key.conforms: [
@@ -5586,7 +5579,7 @@
key.kind: source.lang.swift.decl.struct,
key.name: "FooStruct2",
key.usr: "c:@S@FooStruct2",
- key.offset: 2971,
+ key.offset: 2953,
key.length: 105,
key.fully_annotated_decl: "<decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>FooStruct2</decl.name></decl.struct>",
key.entities: [
@@ -5594,7 +5587,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "x",
key.usr: "c:@S@FooStruct2@FI@x",
- key.offset: 2996,
+ key.offset: 2978,
key.length: 12,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>x</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5602,7 +5595,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "y",
key.usr: "c:@S@FooStruct2@FI@y",
- key.offset: 3014,
+ key.offset: 2996,
key.length: 13,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>y</decl.name>: <decl.var.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5610,7 +5603,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init()",
key.usr: "s:So10FooStruct2VABycfc",
- key.offset: 3033,
+ key.offset: 3015,
key.length: 6,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>()</decl.function.constructor>"
},
@@ -5618,7 +5611,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(x:y:)",
key.usr: "s:So10FooStruct2V1x1yABs5Int32V_Sdtcfc",
- key.offset: 3045,
+ key.offset: 3027,
key.length: 29,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>y</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -5626,14 +5619,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "x",
key.name: "x",
- key.offset: 3055,
+ key.offset: 3037,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "y",
key.name: "y",
- key.offset: 3067,
+ key.offset: 3049,
key.length: 6
}
]
@@ -5644,7 +5637,7 @@
key.kind: source.lang.swift.decl.typealias,
key.name: "FooStructTypedef1",
key.usr: "c:Foo.h@T@FooStructTypedef1",
- key.offset: 3077,
+ key.offset: 3059,
key.length: 40,
key.fully_annotated_decl: "<decl.typealias><syntaxtype.keyword>typealias</syntaxtype.keyword> <decl.name>FooStructTypedef1</decl.name> = <ref.struct usr=\"c:@S@FooStruct2\">FooStruct2</ref.struct></decl.typealias>"
},
@@ -5652,7 +5645,7 @@
key.kind: source.lang.swift.decl.struct,
key.name: "FooStructTypedef2",
key.usr: "c:@SA@FooStructTypedef2",
- key.offset: 3118,
+ key.offset: 3100,
key.length: 112,
key.fully_annotated_decl: "<decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>FooStructTypedef2</decl.name></decl.struct>",
key.entities: [
@@ -5660,7 +5653,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "x",
key.usr: "c:@SA@FooStructTypedef2@FI@x",
- key.offset: 3150,
+ key.offset: 3132,
key.length: 12,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>x</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5668,7 +5661,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "y",
key.usr: "c:@SA@FooStructTypedef2@FI@y",
- key.offset: 3168,
+ key.offset: 3150,
key.length: 13,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>y</decl.name>: <decl.var.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -5676,7 +5669,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init()",
key.usr: "s:So17FooStructTypedef2aABycfc",
- key.offset: 3187,
+ key.offset: 3169,
key.length: 6,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>()</decl.function.constructor>"
},
@@ -5684,7 +5677,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(x:y:)",
key.usr: "s:So17FooStructTypedef2a1x1yABs5Int32V_Sdtcfc",
- key.offset: 3199,
+ key.offset: 3181,
key.length: 29,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>y</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -5692,14 +5685,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "x",
key.name: "x",
- key.offset: 3209,
+ key.offset: 3191,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "y",
key.name: "y",
- key.offset: 3221,
+ key.offset: 3203,
key.length: 6
}
]
@@ -5711,7 +5704,7 @@
key.name: "FooTypedef1",
key.usr: "c:Foo.h@T@FooTypedef1",
key.doc.full_as_xml: "<Typedef file=Foo.h line=\"60\" column=\"13\"><Name>FooTypedef1</Name><USR>c:Foo.h@T@FooTypedef1</USR><Declaration>typealias FooTypedef1 = Int32</Declaration><Abstract><Para> Aaa. FooTypedef1. Bbb.</Para></Abstract></Typedef>",
- key.offset: 3231,
+ key.offset: 3213,
key.length: 29,
key.fully_annotated_decl: "<decl.typealias><syntaxtype.keyword>typealias</syntaxtype.keyword> <decl.name>FooTypedef1</decl.name> = <ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.typealias>",
key.conforms: [
@@ -5737,7 +5730,7 @@
key.name: "fooIntVar",
key.usr: "c:@fooIntVar",
key.doc.full_as_xml: "<Variable file=Foo.h line=\"63\" column=\"12\"><Name>fooIntVar</Name><USR>c:@fooIntVar</USR><Declaration>var fooIntVar: Int32</Declaration><Abstract><Para> Aaa. fooIntVar. Bbb.</Para></Abstract></Variable>",
- key.offset: 3261,
+ key.offset: 3243,
key.length: 20,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooIntVar</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type></decl.var.global>"
},
@@ -5746,7 +5739,7 @@
key.name: "fooFunc1(_:)",
key.usr: "c:@F@fooFunc1",
key.doc.full_as_xml: "<Function file=Foo.h line=\"66\" column=\"5\"><Name>fooFunc1</Name><USR>c:@F@fooFunc1</USR><Declaration>func fooFunc1(_ a: Int32) -> Int32</Declaration><Abstract><Para> Aaa. fooFunc1. Bbb.</Para></Abstract></Function>",
- key.offset: 3282,
+ key.offset: 3264,
key.length: 34,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFunc1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype></decl.function.free>",
key.entities: [
@@ -5754,7 +5747,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 3301,
+ key.offset: 3283,
key.length: 5
}
]
@@ -5763,14 +5756,14 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFunc1AnonymousParam(_:)",
key.usr: "c:@F@fooFunc1AnonymousParam",
- key.offset: 3317,
+ key.offset: 3299,
key.length: 48,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFunc1AnonymousParam</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype></decl.function.free>",
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
- key.offset: 3350,
+ key.offset: 3332,
key.length: 5
}
]
@@ -5779,7 +5772,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFunc3(_:_:_:_:)",
key.usr: "c:@F@fooFunc3",
- key.offset: 3366,
+ key.offset: 3348,
key.length: 94,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFunc3</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>b</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:Sf\">Float</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>c</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:Sd\">Double</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>d</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:Sp\">UnsafeMutablePointer</ref.struct><<ref.struct usr=\"s:s5Int32V\">Int32</ref.struct>>!</decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype></decl.function.free>",
key.entities: [
@@ -5787,28 +5780,28 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 3385,
+ key.offset: 3367,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "b",
- key.offset: 3397,
+ key.offset: 3379,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "c",
- key.offset: 3409,
+ key.offset: 3391,
key.length: 6
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "d",
- key.offset: 3422,
+ key.offset: 3404,
key.length: 28
}
]
@@ -5817,7 +5810,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFuncWithBlock(_:)",
key.usr: "c:@F@fooFuncWithBlock",
- key.offset: 3461,
+ key.offset: 3443,
key.length: 49,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithBlock</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>blk</decl.var.parameter.name>: <decl.var.parameter.type>((<ref.struct usr=\"s:Sf\">Float</ref.struct>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.entities: [
@@ -5825,7 +5818,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "blk",
- key.offset: 3490,
+ key.offset: 3472,
key.length: 19
}
]
@@ -5834,7 +5827,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFuncWithFunctionPointer(_:)",
key.usr: "c:@F@fooFuncWithFunctionPointer",
- key.offset: 3511,
+ key.offset: 3493,
key.length: 60,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithFunctionPointer</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>fptr</decl.var.parameter.name>: <decl.var.parameter.type>((<ref.struct usr=\"s:Sf\">Float</ref.struct>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.entities: [
@@ -5842,7 +5835,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "fptr",
- key.offset: 3551,
+ key.offset: 3533,
key.length: 19
}
]
@@ -5851,7 +5844,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFuncNoreturn1()",
key.usr: "c:@F@fooFuncNoreturn1",
- key.offset: 3572,
+ key.offset: 3554,
key.length: 32,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn1</decl.name>() -> <decl.function.returntype><ref.enum usr=\"s:s5NeverO\">Never</ref.enum></decl.function.returntype></decl.function.free>"
},
@@ -5859,7 +5852,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooFuncNoreturn2()",
key.usr: "c:@F@fooFuncNoreturn2",
- key.offset: 3605,
+ key.offset: 3587,
key.length: 32,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn2</decl.name>() -> <decl.function.returntype><ref.enum usr=\"s:s5NeverO\">Never</ref.enum></decl.function.returntype></decl.function.free>"
},
@@ -5868,7 +5861,7 @@
key.name: "fooFuncWithComment1()",
key.usr: "c:@F@fooFuncWithComment1",
key.doc.full_as_xml: "<Function file=Foo.h line=\"89\" column=\"6\"><Name>fooFuncWithComment1</Name><USR>c:@F@fooFuncWithComment1</USR><Declaration>func fooFuncWithComment1()</Declaration><Abstract><Para> Aaa. fooFuncWithComment1. Bbb. Ccc.</Para></Abstract><Discussion><Para> Ddd.</Para></Discussion></Function>",
- key.offset: 3638,
+ key.offset: 3620,
key.length: 26,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithComment1</decl.name>()</decl.function.free>"
},
@@ -5877,7 +5870,7 @@
key.name: "fooFuncWithComment2()",
key.usr: "c:@F@fooFuncWithComment2",
key.doc.full_as_xml: "<Function file=Foo.h line=\"94\" column=\"6\"><Name>fooFuncWithComment2</Name><USR>c:@F@fooFuncWithComment2</USR><Declaration>func fooFuncWithComment2()</Declaration><Abstract><Para> Aaa. fooFuncWithComment2. Bbb.</Para></Abstract></Function>",
- key.offset: 3665,
+ key.offset: 3647,
key.length: 26,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithComment2</decl.name>()</decl.function.free>"
},
@@ -5886,7 +5879,7 @@
key.name: "fooFuncWithComment3()",
key.usr: "c:@F@fooFuncWithComment3",
key.doc.full_as_xml: "<Function file=Foo.h line=\"102\" column=\"6\"><Name>fooFuncWithComment3</Name><USR>c:@F@fooFuncWithComment3</USR><Declaration>func fooFuncWithComment3()</Declaration><Abstract><Para> Aaa. fooFuncWithComment3. Bbb.</Para></Abstract><Discussion><Para> Ccc.</Para></Discussion></Function>",
- key.offset: 3692,
+ key.offset: 3674,
key.length: 26,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithComment3</decl.name>()</decl.function.free>"
},
@@ -5895,7 +5888,7 @@
key.name: "fooFuncWithComment4()",
key.usr: "c:@F@fooFuncWithComment4",
key.doc.full_as_xml: "<Function file=Foo.h line=\"108\" column=\"6\"><Name>fooFuncWithComment4</Name><USR>c:@F@fooFuncWithComment4</USR><Declaration>func fooFuncWithComment4()</Declaration><Abstract><Para> Aaa. fooFuncWithComment4. Bbb.</Para></Abstract><Discussion><Para> Ddd.</Para></Discussion></Function>",
- key.offset: 3719,
+ key.offset: 3701,
key.length: 26,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithComment4</decl.name>()</decl.function.free>"
},
@@ -5904,7 +5897,7 @@
key.name: "fooFuncWithComment5()",
key.usr: "c:@F@fooFuncWithComment5",
key.doc.full_as_xml: "<Function file=Foo.h line=\"114\" column=\"6\"><Name>fooFuncWithComment5</Name><USR>c:@F@fooFuncWithComment5</USR><Declaration>func fooFuncWithComment5()</Declaration><Abstract><Para> Aaa. fooFuncWithComment5. Bbb. Ccc.</Para></Abstract><Discussion><Para> Ddd.</Para></Discussion></Function>",
- key.offset: 3746,
+ key.offset: 3728,
key.length: 26,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithComment5</decl.name>()</decl.function.free>"
},
@@ -5913,7 +5906,7 @@
key.name: "redeclaredInMultipleModulesFunc1(_:)",
key.usr: "c:@F@redeclaredInMultipleModulesFunc1",
key.doc.full_as_xml: "<Function file=Foo.h line=\"118\" column=\"5\"><Name>redeclaredInMultipleModulesFunc1</Name><USR>c:@F@redeclaredInMultipleModulesFunc1</USR><Declaration>func redeclaredInMultipleModulesFunc1(_ a: Int32) -> Int32</Declaration><Abstract><Para> Aaa. redeclaredInMultipleModulesFunc1. Bbb.</Para></Abstract></Function>",
- key.offset: 3773,
+ key.offset: 3755,
key.length: 58,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>redeclaredInMultipleModulesFunc1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype></decl.function.free>",
key.entities: [
@@ -5921,7 +5914,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 3816,
+ key.offset: 3798,
key.length: 5
}
]
@@ -5931,7 +5924,7 @@
key.name: "FooProtocolBase",
key.usr: "c:objc(pl)FooProtocolBase",
key.doc.full_as_xml: "<Other file=Foo.h line=\"121\" column=\"11\"><Name>FooProtocolBase</Name><USR>c:objc(pl)FooProtocolBase</USR><Declaration>protocol FooProtocolBase</Declaration><Abstract><Para> Aaa. FooProtocolBase. Bbb.</Para></Abstract></Other>",
- key.offset: 3832,
+ key.offset: 3814,
key.length: 301,
key.fully_annotated_decl: "<decl.protocol><syntaxtype.keyword>protocol</syntaxtype.keyword> <decl.name>FooProtocolBase</decl.name></decl.protocol>",
key.entities: [
@@ -5940,7 +5933,7 @@
key.name: "fooProtoFunc()",
key.usr: "c:objc(pl)FooProtocolBase(im)fooProtoFunc",
key.doc.full_as_xml: "<Function isInstanceMethod=\"1\" file=Foo.h line=\"125\" column=\"1\"><Name>fooProtoFunc</Name><USR>c:objc(pl)FooProtocolBase(im)fooProtoFunc</USR><Declaration>func fooProtoFunc()</Declaration><Abstract><Para> Aaa. fooProtoFunc. Bbb. Ccc.</Para></Abstract></Function>",
- key.offset: 3864,
+ key.offset: 3846,
key.length: 19,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooProtoFunc</decl.name>()</decl.function.method.instance>"
},
@@ -5949,7 +5942,7 @@
key.name: "fooProtoFuncWithExtraIndentation1()",
key.usr: "c:objc(pl)FooProtocolBase(im)fooProtoFuncWithExtraIndentation1",
key.doc.full_as_xml: "<Function isInstanceMethod=\"1\" file=Foo.h line=\"129\" column=\"3\"><Name>fooProtoFuncWithExtraIndentation1</Name><USR>c:objc(pl)FooProtocolBase(im)fooProtoFuncWithExtraIndentation1</USR><Declaration>func fooProtoFuncWithExtraIndentation1()</Declaration><Abstract><Para> Aaa. fooProtoFuncWithExtraIndentation1. Bbb. Ccc.</Para></Abstract></Function>",
- key.offset: 3889,
+ key.offset: 3871,
key.length: 40,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooProtoFuncWithExtraIndentation1</decl.name>()</decl.function.method.instance>"
},
@@ -5958,7 +5951,7 @@
key.name: "fooProtoFuncWithExtraIndentation2()",
key.usr: "c:objc(pl)FooProtocolBase(im)fooProtoFuncWithExtraIndentation2",
key.doc.full_as_xml: "<Function isInstanceMethod=\"1\" file=Foo.h line=\"135\" column=\"3\"><Name>fooProtoFuncWithExtraIndentation2</Name><USR>c:objc(pl)FooProtocolBase(im)fooProtoFuncWithExtraIndentation2</USR><Declaration>func fooProtoFuncWithExtraIndentation2()</Declaration><Abstract><Para> Aaa. fooProtoFuncWithExtraIndentation2. Bbb. Ccc.</Para></Abstract></Function>",
- key.offset: 3935,
+ key.offset: 3917,
key.length: 40,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooProtoFuncWithExtraIndentation2</decl.name>()</decl.function.method.instance>"
},
@@ -5966,7 +5959,7 @@
key.kind: source.lang.swift.decl.function.method.static,
key.name: "fooProtoClassFunc()",
key.usr: "c:objc(pl)FooProtocolBase(cm)fooProtoClassFunc",
- key.offset: 3981,
+ key.offset: 3963,
key.length: 31,
key.fully_annotated_decl: "<decl.function.method.static><syntaxtype.keyword>static</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooProtoClassFunc</decl.name>()</decl.function.method.static>"
},
@@ -5974,7 +5967,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty1",
key.usr: "c:objc(pl)FooProtocolBase(py)fooProperty1",
- key.offset: 4018,
+ key.offset: 4000,
key.length: 35,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty1</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -5982,7 +5975,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty2",
key.usr: "c:objc(pl)FooProtocolBase(py)fooProperty2",
- key.offset: 4059,
+ key.offset: 4041,
key.length: 35,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty2</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -5990,7 +5983,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty3",
key.usr: "c:objc(pl)FooProtocolBase(py)fooProperty3",
- key.offset: 4100,
+ key.offset: 4082,
key.length: 31,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty3</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.instance>"
}
@@ -6000,7 +5993,7 @@
key.kind: source.lang.swift.decl.protocol,
key.name: "FooProtocolDerived",
key.usr: "c:objc(pl)FooProtocolDerived",
- key.offset: 4134,
+ key.offset: 4116,
key.length: 49,
key.fully_annotated_decl: "<decl.protocol><syntaxtype.keyword>protocol</syntaxtype.keyword> <decl.name>FooProtocolDerived</decl.name> : <ref.protocol usr=\"c:objc(pl)FooProtocolBase\">FooProtocolBase</ref.protocol></decl.protocol>",
key.conforms: [
@@ -6015,7 +6008,7 @@
key.kind: source.lang.swift.decl.class,
key.name: "FooClassBase",
key.usr: "c:objc(cs)FooClassBase",
- key.offset: 4184,
+ key.offset: 4166,
key.length: 392,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>FooClassBase</decl.name></decl.class>",
key.entities: [
@@ -6023,7 +6016,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooBaseInstanceFunc0()",
key.usr: "c:objc(cs)FooClassBase(im)fooBaseInstanceFunc0",
- key.offset: 4210,
+ key.offset: 4192,
key.length: 27,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooBaseInstanceFunc0</decl.name>()</decl.function.method.instance>"
},
@@ -6031,7 +6024,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooBaseInstanceFunc1(_:)",
key.usr: "c:objc(cs)FooClassBase(im)fooBaseInstanceFunc1:",
- key.offset: 4243,
+ key.offset: 4225,
key.length: 60,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooBaseInstanceFunc1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>anObject</decl.var.parameter.name>: <decl.var.parameter.type>Any!</decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.class usr=\"c:objc(cs)FooClassBase\">FooClassBase</ref.class>!</decl.function.returntype></decl.function.method.instance>",
key.entities: [
@@ -6039,7 +6032,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "anObject",
- key.offset: 4281,
+ key.offset: 4263,
key.length: 4
}
]
@@ -6048,7 +6041,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init()",
key.usr: "c:objc(cs)FooClassBase(im)init",
- key.offset: 4309,
+ key.offset: 4291,
key.length: 7,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>!()</decl.function.constructor>"
},
@@ -6056,7 +6049,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(float:)",
key.usr: "c:objc(cs)FooClassBase(im)initWithFloat:",
- key.offset: 4322,
+ key.offset: 4304,
key.length: 33,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>convenience</syntaxtype.keyword> <syntaxtype.keyword>init</syntaxtype.keyword>!(<decl.var.parameter><decl.var.parameter.argument_label>float</decl.var.parameter.argument_label> <decl.var.parameter.name>f</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:Sf\">Float</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -6064,7 +6057,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "float",
key.name: "f",
- key.offset: 4349,
+ key.offset: 4331,
key.length: 5
}
]
@@ -6073,7 +6066,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooBaseInstanceFuncOverridden()",
key.usr: "c:objc(cs)FooClassBase(im)fooBaseInstanceFuncOverridden",
- key.offset: 4361,
+ key.offset: 4343,
key.length: 36,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooBaseInstanceFuncOverridden</decl.name>()</decl.function.method.instance>"
},
@@ -6081,7 +6074,7 @@
key.kind: source.lang.swift.decl.function.method.class,
key.name: "fooBaseClassFunc0()",
key.usr: "c:objc(cs)FooClassBase(cm)fooBaseClassFunc0",
- key.offset: 4403,
+ key.offset: 4385,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.class><syntaxtype.keyword>class</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooBaseClassFunc0</decl.name>()</decl.function.method.class>"
},
@@ -6089,7 +6082,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth1()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth1",
- key.offset: 4439,
+ key.offset: 4421,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth1</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6097,7 +6090,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth2()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth2",
- key.offset: 4474,
+ key.offset: 4456,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth2</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6105,7 +6098,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "nonInternalMeth()",
key.usr: "c:objc(cs)FooClassBase(im)nonInternalMeth",
- key.offset: 4509,
+ key.offset: 4491,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>nonInternalMeth</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6113,7 +6106,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth3()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth3",
- key.offset: 4545,
+ key.offset: 4527,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth3</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6124,7 +6117,7 @@
key.name: "FooClassDerived",
key.usr: "c:objc(cs)FooClassDerived",
key.doc.full_as_xml: "<Other file=Foo.h line=\"158\" column=\"12\"><Name>FooClassDerived</Name><USR>c:objc(cs)FooClassDerived</USR><Declaration>class FooClassDerived : FooClassBase, FooProtocolDerived</Declaration><Abstract><Para> Aaa. FooClassDerived. Bbb.</Para></Abstract></Other>",
- key.offset: 4577,
+ key.offset: 4559,
key.length: 493,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>FooClassDerived</decl.name> : <ref.class usr=\"c:objc(cs)FooClassBase\">FooClassBase</ref.class>, <ref.protocol usr=\"c:objc(pl)FooProtocolDerived\">FooProtocolDerived</ref.protocol></decl.class>",
key.inherits: [
@@ -6146,7 +6139,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty1",
key.usr: "c:objc(cs)FooClassDerived(py)fooProperty1",
- key.offset: 4641,
+ key.offset: 4623,
key.length: 23,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty1</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6154,7 +6147,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty2",
key.usr: "c:objc(cs)FooClassDerived(py)fooProperty2",
- key.offset: 4670,
+ key.offset: 4652,
key.length: 23,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty2</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6162,7 +6155,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "fooProperty3",
key.usr: "c:objc(cs)FooClassDerived(py)fooProperty3",
- key.offset: 4699,
+ key.offset: 4681,
key.length: 31,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>fooProperty3</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6170,7 +6163,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooInstanceFunc0()",
key.usr: "c:objc(cs)FooClassDerived(im)fooInstanceFunc0",
- key.offset: 4736,
+ key.offset: 4718,
key.length: 23,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooInstanceFunc0</decl.name>()</decl.function.method.instance>"
},
@@ -6178,7 +6171,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooInstanceFunc1(_:)",
key.usr: "c:objc(cs)FooClassDerived(im)fooInstanceFunc1:",
- key.offset: 4765,
+ key.offset: 4747,
key.length: 33,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooInstanceFunc1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -6186,7 +6179,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 4792,
+ key.offset: 4774,
key.length: 5
}
]
@@ -6195,7 +6188,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooInstanceFunc2(_:withB:)",
key.usr: "c:objc(cs)FooClassDerived(im)fooInstanceFunc2:withB:",
- key.offset: 4804,
+ key.offset: 4786,
key.length: 49,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooInstanceFunc2</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>withB</decl.var.parameter.argument_label> <decl.var.parameter.name>b</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.method.instance>",
key.entities: [
@@ -6203,14 +6196,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 4831,
+ key.offset: 4813,
key.length: 5
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "withB",
key.name: "b",
- key.offset: 4847,
+ key.offset: 4829,
key.length: 5
}
]
@@ -6219,7 +6212,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "fooBaseInstanceFuncOverridden()",
key.usr: "c:objc(cs)FooClassDerived(im)fooBaseInstanceFuncOverridden",
- key.offset: 4859,
+ key.offset: 4841,
key.length: 36,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooBaseInstanceFuncOverridden</decl.name>()</decl.function.method.instance>",
key.inherits: [
@@ -6234,7 +6227,7 @@
key.kind: source.lang.swift.decl.function.method.class,
key.name: "fooClassFunc0()",
key.usr: "c:objc(cs)FooClassDerived(cm)fooClassFunc0",
- key.offset: 4901,
+ key.offset: 4883,
key.length: 26,
key.fully_annotated_decl: "<decl.function.method.class><syntaxtype.keyword>class</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooClassFunc0</decl.name>()</decl.function.method.class>"
},
@@ -6243,7 +6236,7 @@
key.name: "_internalMeth1()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth1::SYNTHESIZED::c:objc(cs)FooClassDerived",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth1",
- key.offset: 4933,
+ key.offset: 4915,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth1</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6252,7 +6245,7 @@
key.name: "_internalMeth2()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth2::SYNTHESIZED::c:objc(cs)FooClassDerived",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth2",
- key.offset: 4968,
+ key.offset: 4950,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth2</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6261,7 +6254,7 @@
key.name: "nonInternalMeth()",
key.usr: "c:objc(cs)FooClassBase(im)nonInternalMeth::SYNTHESIZED::c:objc(cs)FooClassDerived",
key.original_usr: "c:objc(cs)FooClassBase(im)nonInternalMeth",
- key.offset: 5003,
+ key.offset: 4985,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>nonInternalMeth</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6270,7 +6263,7 @@
key.name: "_internalMeth3()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth3::SYNTHESIZED::c:objc(cs)FooClassDerived",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth3",
- key.offset: 5039,
+ key.offset: 5021,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth3</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6280,7 +6273,7 @@
key.kind: source.lang.swift.decl.typealias,
key.name: "typedef_int_t",
key.usr: "c:Foo.h@T@typedef_int_t",
- key.offset: 5071,
+ key.offset: 5053,
key.length: 31,
key.fully_annotated_decl: "<decl.typealias><syntaxtype.keyword>typealias</syntaxtype.keyword> <decl.name>typedef_int_t</decl.name> = <ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.typealias>",
key.conforms: [
@@ -6305,7 +6298,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_1",
key.usr: "c:Foo.h@3720@macro@FOO_MACRO_1",
- key.offset: 5103,
+ key.offset: 5085,
key.length: 30,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_1</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6313,7 +6306,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_2",
key.usr: "c:Foo.h@3742@macro@FOO_MACRO_2",
- key.offset: 5134,
+ key.offset: 5116,
key.length: 30,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_2</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6321,7 +6314,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_3",
key.usr: "c:Foo.h@3764@macro@FOO_MACRO_3",
- key.offset: 5165,
+ key.offset: 5147,
key.length: 30,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_3</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6329,7 +6322,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_4",
key.usr: "c:Foo.h@3828@macro@FOO_MACRO_4",
- key.offset: 5196,
+ key.offset: 5178,
key.length: 31,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_4</decl.name>: <decl.var.type><ref.struct usr=\"s:s6UInt32V\">UInt32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6337,7 +6330,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_5",
key.usr: "c:Foo.h@3860@macro@FOO_MACRO_5",
- key.offset: 5228,
+ key.offset: 5210,
key.length: 31,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_5</decl.name>: <decl.var.type><ref.struct usr=\"s:s6UInt64V\">UInt64</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6345,7 +6338,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_6",
key.usr: "c:Foo.h@3902@macro@FOO_MACRO_6",
- key.offset: 5260,
+ key.offset: 5242,
key.length: 38,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_6</decl.name>: <decl.var.type><ref.typealias usr=\"c:Foo.h@T@typedef_int_t\">typedef_int_t</ref.typealias></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6353,7 +6346,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_7",
key.usr: "c:Foo.h@3943@macro@FOO_MACRO_7",
- key.offset: 5299,
+ key.offset: 5281,
key.length: 38,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_7</decl.name>: <decl.var.type><ref.typealias usr=\"c:Foo.h@T@typedef_int_t\">typedef_int_t</ref.typealias></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6361,7 +6354,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_8",
key.usr: "c:Foo.h@3984@macro@FOO_MACRO_8",
- key.offset: 5338,
+ key.offset: 5320,
key.length: 29,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_8</decl.name>: <decl.var.type><ref.struct usr=\"s:s4Int8V\">Int8</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6369,7 +6362,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_9",
key.usr: "c:Foo.h@4015@macro@FOO_MACRO_9",
- key.offset: 5368,
+ key.offset: 5350,
key.length: 30,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_9</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6377,7 +6370,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_10",
key.usr: "c:Foo.h@4045@macro@FOO_MACRO_10",
- key.offset: 5399,
+ key.offset: 5381,
key.length: 31,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_10</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int16V\">Int16</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6385,7 +6378,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_11",
key.usr: "c:Foo.h@4079@macro@FOO_MACRO_11",
- key.offset: 5431,
+ key.offset: 5413,
key.length: 29,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_11</decl.name>: <decl.var.type><ref.struct usr=\"s:Si\">Int</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6393,7 +6386,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_OR",
key.usr: "c:Foo.h@4112@macro@FOO_MACRO_OR",
- key.offset: 5461,
+ key.offset: 5443,
key.length: 31,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_OR</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6401,7 +6394,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_AND",
key.usr: "c:Foo.h@4161@macro@FOO_MACRO_AND",
- key.offset: 5493,
+ key.offset: 5475,
key.length: 32,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_AND</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6409,7 +6402,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_BITWIDTH",
key.usr: "c:Foo.h@4211@macro@FOO_MACRO_BITWIDTH",
- key.offset: 5526,
+ key.offset: 5508,
key.length: 38,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_BITWIDTH</decl.name>: <decl.var.type><ref.struct usr=\"s:s6UInt64V\">UInt64</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6417,7 +6410,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_SIGNED",
key.usr: "c:Foo.h@4266@macro@FOO_MACRO_SIGNED",
- key.offset: 5565,
+ key.offset: 5547,
key.length: 36,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_SIGNED</decl.name>: <decl.var.type><ref.struct usr=\"s:s6UInt32V\">UInt32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6425,7 +6418,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_REDEF_1",
key.usr: "c:Foo.h@4477@macro@FOO_MACRO_REDEF_1",
- key.offset: 5602,
+ key.offset: 5584,
key.length: 36,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_REDEF_1</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6433,7 +6426,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_MACRO_REDEF_2",
key.usr: "c:Foo.h@4534@macro@FOO_MACRO_REDEF_2",
- key.offset: 5639,
+ key.offset: 5621,
key.length: 36,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_MACRO_REDEF_2</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>"
},
@@ -6441,7 +6434,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "theLastDeclInFoo()",
key.usr: "c:@F@theLastDeclInFoo",
- key.offset: 5676,
+ key.offset: 5658,
key.length: 23,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>theLastDeclInFoo</decl.name>()</decl.function.free>"
},
@@ -6449,7 +6442,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "_internalTopLevelFunc()",
key.usr: "c:@F@_internalTopLevelFunc",
- key.offset: 5700,
+ key.offset: 5682,
key.length: 28,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalTopLevelFunc</decl.name>()</decl.function.free>"
},
@@ -6457,7 +6450,7 @@
key.kind: source.lang.swift.decl.struct,
key.name: "_InternalStruct",
key.usr: "c:@S@_InternalStruct",
- key.offset: 5729,
+ key.offset: 5711,
key.length: 78,
key.fully_annotated_decl: "<decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>_InternalStruct</decl.name></decl.struct>",
key.entities: [
@@ -6465,7 +6458,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "x",
key.usr: "c:@S@_InternalStruct@FI@x",
- key.offset: 5759,
+ key.offset: 5741,
key.length: 12,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>x</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type></decl.var.instance>"
},
@@ -6473,7 +6466,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init()",
key.usr: "s:So15_InternalStructVABycfc",
- key.offset: 5777,
+ key.offset: 5759,
key.length: 6,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>()</decl.function.constructor>"
},
@@ -6481,7 +6474,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(x:)",
key.usr: "s:So15_InternalStructV1xABs5Int32V_tcfc",
- key.offset: 5789,
+ key.offset: 5771,
key.length: 16,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -6489,7 +6482,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "x",
key.name: "x",
- key.offset: 5799,
+ key.offset: 5781,
key.length: 5
}
]
@@ -6498,7 +6491,7 @@
},
{
key.kind: source.lang.swift.decl.extension.class,
- key.offset: 5808,
+ key.offset: 5790,
key.length: 61,
key.extends: {
key.kind: source.lang.swift.ref.class,
@@ -6510,7 +6503,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth1()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth1",
- key.offset: 5838,
+ key.offset: 5820,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth1</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6518,7 +6511,7 @@
},
{
key.kind: source.lang.swift.decl.extension.class,
- key.offset: 5870,
+ key.offset: 5852,
key.length: 97,
key.extends: {
key.kind: source.lang.swift.ref.class,
@@ -6530,7 +6523,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth2()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth2",
- key.offset: 5900,
+ key.offset: 5882,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth2</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6538,7 +6531,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "nonInternalMeth()",
key.usr: "c:objc(cs)FooClassBase(im)nonInternalMeth",
- key.offset: 5935,
+ key.offset: 5917,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>nonInternalMeth</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6546,7 +6539,7 @@
},
{
key.kind: source.lang.swift.decl.extension.class,
- key.offset: 5968,
+ key.offset: 5950,
key.length: 61,
key.extends: {
key.kind: source.lang.swift.ref.class,
@@ -6558,7 +6551,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "_internalMeth3()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth3",
- key.offset: 5998,
+ key.offset: 5980,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth3</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6568,7 +6561,7 @@
key.kind: source.lang.swift.decl.protocol,
key.name: "_InternalProt",
key.usr: "c:objc(pl)_InternalProt",
- key.offset: 6030,
+ key.offset: 6012,
key.length: 26,
key.fully_annotated_decl: "<decl.protocol><syntaxtype.keyword>protocol</syntaxtype.keyword> <decl.name>_InternalProt</decl.name></decl.protocol>"
},
@@ -6576,7 +6569,7 @@
key.kind: source.lang.swift.decl.class,
key.name: "ClassWithInternalProt",
key.usr: "c:objc(cs)ClassWithInternalProt",
- key.offset: 6057,
+ key.offset: 6039,
key.length: 47,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>ClassWithInternalProt</decl.name> : <ref.protocol usr=\"c:objc(pl)_InternalProt\">_InternalProt</ref.protocol></decl.class>",
key.conforms: [
@@ -6591,7 +6584,7 @@
key.kind: source.lang.swift.decl.class,
key.name: "FooClassPropertyOwnership",
key.usr: "c:objc(cs)FooClassPropertyOwnership",
- key.offset: 6105,
+ key.offset: 6087,
key.length: 425,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>FooClassPropertyOwnership</decl.name> : <ref.class usr=\"c:objc(cs)FooClassBase\">FooClassBase</ref.class></decl.class>",
key.inherits: [
@@ -6606,7 +6599,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "assignable",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)assignable",
- key.offset: 6159,
+ key.offset: 6141,
key.length: 42,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>assignable</decl.name>: <decl.var.type>AnyObject!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6614,7 +6607,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "unsafeAssignable",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)unsafeAssignable",
- key.offset: 6207,
+ key.offset: 6189,
key.length: 48,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>unsafeAssignable</decl.name>: <decl.var.type>AnyObject!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6622,7 +6615,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "retainable",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)retainable",
- key.offset: 6261,
+ key.offset: 6243,
key.length: 20,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>retainable</decl.name>: <decl.var.type>Any!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6630,7 +6623,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "strongRef",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)strongRef",
- key.offset: 6287,
+ key.offset: 6269,
key.length: 19,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>strongRef</decl.name>: <decl.var.type>Any!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6638,7 +6631,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "copyable",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)copyable",
- key.offset: 6312,
+ key.offset: 6294,
key.length: 18,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>copyable</decl.name>: <decl.var.type>Any!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6646,7 +6639,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "weakRef",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)weakRef",
- key.offset: 6336,
+ key.offset: 6318,
key.length: 28,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>weak</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>weakRef</decl.name>: <decl.var.type>AnyObject!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6654,7 +6647,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "scalar",
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)scalar",
- key.offset: 6370,
+ key.offset: 6352,
key.length: 17,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>scalar</decl.name>: <decl.var.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
@@ -6663,7 +6656,7 @@
key.name: "_internalMeth1()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth1::SYNTHESIZED::c:objc(cs)FooClassPropertyOwnership",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth1",
- key.offset: 6393,
+ key.offset: 6375,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth1</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6672,7 +6665,7 @@
key.name: "_internalMeth2()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth2::SYNTHESIZED::c:objc(cs)FooClassPropertyOwnership",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth2",
- key.offset: 6428,
+ key.offset: 6410,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth2</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6681,7 +6674,7 @@
key.name: "nonInternalMeth()",
key.usr: "c:objc(cs)FooClassBase(im)nonInternalMeth::SYNTHESIZED::c:objc(cs)FooClassPropertyOwnership",
key.original_usr: "c:objc(cs)FooClassBase(im)nonInternalMeth",
- key.offset: 6463,
+ key.offset: 6445,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>nonInternalMeth</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6690,7 +6683,7 @@
key.name: "_internalMeth3()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth3::SYNTHESIZED::c:objc(cs)FooClassPropertyOwnership",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth3",
- key.offset: 6499,
+ key.offset: 6481,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth3</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6700,7 +6693,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FOO_NIL",
key.usr: "c:Foo.h@5323@macro@FOO_NIL",
- key.offset: 6531,
+ key.offset: 6513,
key.length: 15,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FOO_NIL</decl.name>: <decl.var.type><tuple>()</tuple></decl.var.type></decl.var.global>",
key.attributes: [
@@ -6716,7 +6709,7 @@
key.kind: source.lang.swift.decl.class,
key.name: "FooUnavailableMembers",
key.usr: "c:objc(cs)FooUnavailableMembers",
- key.offset: 6547,
+ key.offset: 6529,
key.length: 592,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>FooUnavailableMembers</decl.name> : <ref.class usr=\"c:objc(cs)FooClassBase\">FooClassBase</ref.class></decl.class>",
key.inherits: [
@@ -6731,7 +6724,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(int:)",
key.usr: "c:objc(cs)FooUnavailableMembers(cm)unavailableMembersWithInt:",
- key.offset: 6597,
+ key.offset: 6579,
key.length: 31,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>convenience</syntaxtype.keyword> <syntaxtype.keyword>init</syntaxtype.keyword>!(<decl.var.parameter><decl.var.parameter.argument_label>int</decl.var.parameter.argument_label> <decl.var.parameter.name>i</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -6739,7 +6732,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "int",
key.name: "i",
- key.offset: 6622,
+ key.offset: 6604,
key.length: 5
}
]
@@ -6748,7 +6741,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "unavailable()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)unavailable",
- key.offset: 6634,
+ key.offset: 6616,
key.length: 18,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>unavailable</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6764,7 +6757,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "swiftUnavailable()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)swiftUnavailable",
- key.offset: 6658,
+ key.offset: 6640,
key.length: 23,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>swiftUnavailable</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6779,7 +6772,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "deprecated()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)deprecated",
- key.offset: 6687,
+ key.offset: 6669,
key.length: 17,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>deprecated</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6795,7 +6788,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityIntroduced()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityIntroduced",
- key.offset: 6710,
+ key.offset: 6692,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityIntroduced</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6810,7 +6803,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityDeprecated()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityDeprecated",
- key.offset: 6745,
+ key.offset: 6727,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityDeprecated</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6829,7 +6822,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityObsoleted()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityObsoleted",
- key.offset: 6780,
+ key.offset: 6762,
key.length: 28,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityObsoleted</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6845,7 +6838,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityUnavailable()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityUnavailable",
- key.offset: 6814,
+ key.offset: 6796,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityUnavailable</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6861,7 +6854,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityIntroducedMsg()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityIntroducedMsg",
- key.offset: 6850,
+ key.offset: 6832,
key.length: 32,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityIntroducedMsg</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6877,7 +6870,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityDeprecatedMsg()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityDeprecatedMsg",
- key.offset: 6888,
+ key.offset: 6870,
key.length: 32,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityDeprecatedMsg</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6896,7 +6889,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityObsoletedMsg()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityObsoletedMsg",
- key.offset: 6926,
+ key.offset: 6908,
key.length: 31,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityObsoletedMsg</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6913,7 +6906,7 @@
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "availabilityUnavailableMsg()",
key.usr: "c:objc(cs)FooUnavailableMembers(im)availabilityUnavailableMsg",
- key.offset: 6963,
+ key.offset: 6945,
key.length: 33,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>availabilityUnavailableMsg</decl.name>()</decl.function.method.instance>",
key.attributes: [
@@ -6931,7 +6924,7 @@
key.name: "_internalMeth1()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth1::SYNTHESIZED::c:objc(cs)FooUnavailableMembers",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth1",
- key.offset: 7002,
+ key.offset: 6984,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth1</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6940,7 +6933,7 @@
key.name: "_internalMeth2()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth2::SYNTHESIZED::c:objc(cs)FooUnavailableMembers",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth2",
- key.offset: 7037,
+ key.offset: 7019,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth2</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6949,7 +6942,7 @@
key.name: "nonInternalMeth()",
key.usr: "c:objc(cs)FooClassBase(im)nonInternalMeth::SYNTHESIZED::c:objc(cs)FooUnavailableMembers",
key.original_usr: "c:objc(cs)FooClassBase(im)nonInternalMeth",
- key.offset: 7072,
+ key.offset: 7054,
key.length: 30,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>nonInternalMeth</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
},
@@ -6958,7 +6951,7 @@
key.name: "_internalMeth3()",
key.usr: "c:objc(cs)FooClassBase(im)_internalMeth3::SYNTHESIZED::c:objc(cs)FooUnavailableMembers",
key.original_usr: "c:objc(cs)FooClassBase(im)_internalMeth3",
- key.offset: 7108,
+ key.offset: 7090,
key.length: 29,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>_internalMeth3</decl.name>() -> <decl.function.returntype>Any!</decl.function.returntype></decl.function.method.instance>"
}
@@ -6968,7 +6961,7 @@
key.kind: source.lang.swift.decl.class,
key.name: "FooCFType",
key.usr: "c:Foo.h@T@FooCFTypeRef",
- key.offset: 7140,
+ key.offset: 7122,
key.length: 19,
key.fully_annotated_decl: "<decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>FooCFType</decl.name></decl.class>"
},
@@ -6976,14 +6969,14 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "FooCFTypeRelease(_:)",
key.usr: "c:@F@FooCFTypeRelease",
- key.offset: 7160,
+ key.offset: 7142,
key.length: 38,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>FooCFTypeRelease</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.class usr=\"c:Foo.h@T@FooCFTypeRef\">FooCFType</ref.class>!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
- key.offset: 7187,
+ key.offset: 7169,
key.length: 10
}
],
@@ -7000,7 +6993,7 @@
key.kind: source.lang.swift.decl.enum,
key.name: "ABAuthorizationStatus",
key.usr: "c:@E@ABAuthorizationStatus",
- key.offset: 7199,
+ key.offset: 7181,
key.length: 170,
key.fully_annotated_decl: "<decl.enum><syntaxtype.keyword>enum</syntaxtype.keyword> <decl.name>ABAuthorizationStatus</decl.name> : <ref.struct usr=\"s:Si\">Int</ref.struct></decl.enum>",
key.inherits: [
@@ -7015,7 +7008,7 @@
key.kind: source.lang.swift.decl.enumelement,
key.name: "notDetermined",
key.usr: "c:@E@ABAuthorizationStatus@kABAuthorizationStatusNotDetermined",
- key.offset: 7239,
+ key.offset: 7221,
key.length: 18,
key.fully_annotated_decl: "<decl.enumelement><syntaxtype.keyword>case</syntaxtype.keyword> <decl.name>notDetermined</decl.name> = <syntaxtype.number>0</syntaxtype.number></decl.enumelement>",
key.attributes: [
@@ -7030,7 +7023,7 @@
key.kind: source.lang.swift.decl.enumelement,
key.name: "restricted",
key.usr: "c:@E@ABAuthorizationStatus@kABAuthorizationStatusRestricted",
- key.offset: 7263,
+ key.offset: 7245,
key.length: 15,
key.fully_annotated_decl: "<decl.enumelement><syntaxtype.keyword>case</syntaxtype.keyword> <decl.name>restricted</decl.name> = <syntaxtype.number>1</syntaxtype.number></decl.enumelement>",
key.attributes: [
@@ -7047,7 +7040,7 @@
key.usr: "s:s9EquatablePsE2neoiySbx_xtFZ::SYNTHESIZED::c:@E@ABAuthorizationStatus",
key.original_usr: "s:s9EquatablePsE2neoiySbx_xtFZ",
key.doc.full_as_xml: "<Function><Name>!=(_:_:)</Name><USR>s:s9EquatablePsE2neoiySbx_xtFZ</USR><Declaration>static func != (lhs: Self, rhs: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value indicating whether two values are not equal.</Para></Abstract><Parameters><Parameter><Name>lhs</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A value to compare.</Para></Discussion></Parameter><Parameter><Name>rhs</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>Another value to compare.</Para></Discussion></Parameter></Parameters><Discussion><Para>Inequality is the inverse of equality. For any values <codeVoice>a</codeVoice> and <codeVoice>b</codeVoice>, <codeVoice>a != b</codeVoice> implies that <codeVoice>a == b</codeVoice> is <codeVoice>false</codeVoice>.</Para><Para>This is the default implementation of the not-equal-to operator (<codeVoice>!=</codeVoice>) for any type that conforms to <codeVoice>Equatable</codeVoice>.</Para></Discussion></CommentParts></Function>",
- key.offset: 7284,
+ key.offset: 7266,
key.length: 83,
key.fully_annotated_decl: "<decl.function.operator.infix><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>static</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>!= </decl.name>(<decl.var.parameter><decl.var.parameter.name>lhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.enum usr=\"c:@E@ABAuthorizationStatus\">ABAuthorizationStatus</ref.enum></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.name>rhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.enum usr=\"c:@E@ABAuthorizationStatus\">ABAuthorizationStatus</ref.enum></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.operator.infix>",
key.entities: [
@@ -7055,14 +7048,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "lhs",
- key.offset: 7307,
+ key.offset: 7289,
key.length: 21
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "rhs",
- key.offset: 7337,
+ key.offset: 7319,
key.length: 21
}
]
@@ -7081,7 +7074,7 @@
key.kind: source.lang.swift.decl.function.free,
key.name: "fooSubFunc1(_:)",
key.usr: "c:@F@fooSubFunc1",
- key.offset: 7370,
+ key.offset: 7352,
key.length: 37,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooSubFunc1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>a</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:s5Int32V\">Int32</ref.struct></decl.function.returntype></decl.function.free>",
key.entities: [
@@ -7089,7 +7082,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
- key.offset: 7392,
+ key.offset: 7374,
key.length: 5
}
],
@@ -7099,7 +7092,7 @@
key.kind: source.lang.swift.decl.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
- key.offset: 7408,
+ key.offset: 7390,
key.length: 214,
key.fully_annotated_decl: "<decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>FooSubEnum1</decl.name> : <ref.protocol usr=\"s:s9EquatableP\">Equatable</ref.protocol>, <ref.protocol usr=\"s:s16RawRepresentableP\">RawRepresentable</ref.protocol></decl.struct>",
key.conforms: [
@@ -7119,7 +7112,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(_:)",
key.usr: "s:So11FooSubEnum1VyABs6UInt32Vcfc",
- key.offset: 7464,
+ key.offset: 7446,
key.length: 24,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>rawValue</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:s6UInt32V\">UInt32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.entities: [
@@ -7127,7 +7120,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "rawValue",
- key.offset: 7481,
+ key.offset: 7463,
key.length: 6
}
]
@@ -7136,7 +7129,7 @@
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(rawValue:)",
key.usr: "s:So11FooSubEnum1V8rawValueABs6UInt32V_tcfc",
- key.offset: 7494,
+ key.offset: 7476,
key.length: 31,
key.fully_annotated_decl: "<decl.function.constructor><syntaxtype.keyword>init</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.argument_label>rawValue</decl.var.parameter.argument_label>: <decl.var.parameter.type><ref.struct usr=\"s:s6UInt32V\">UInt32</ref.struct></decl.var.parameter.type></decl.var.parameter>)</decl.function.constructor>",
key.conforms: [
@@ -7151,7 +7144,7 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "rawValue",
key.name: "rawValue",
- key.offset: 7518,
+ key.offset: 7500,
key.length: 6
}
]
@@ -7160,7 +7153,7 @@
key.kind: source.lang.swift.decl.var.instance,
key.name: "rawValue",
key.usr: "s:So11FooSubEnum1V8rawValues6UInt32Vvp",
- key.offset: 7531,
+ key.offset: 7513,
key.length: 20,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>rawValue</decl.name>: <decl.var.type><ref.struct usr=\"s:s6UInt32V\">UInt32</ref.struct></decl.var.type></decl.var.instance>",
key.conforms: [
@@ -7177,7 +7170,7 @@
key.usr: "s:s9EquatablePsE2neoiySbx_xtFZ::SYNTHESIZED::c:@E@FooSubEnum1",
key.original_usr: "s:s9EquatablePsE2neoiySbx_xtFZ",
key.doc.full_as_xml: "<Function><Name>!=(_:_:)</Name><USR>s:s9EquatablePsE2neoiySbx_xtFZ</USR><Declaration>static func != (lhs: Self, rhs: Self) -> Bool</Declaration><CommentParts><Abstract><Para>Returns a Boolean value indicating whether two values are not equal.</Para></Abstract><Parameters><Parameter><Name>lhs</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>A value to compare.</Para></Discussion></Parameter><Parameter><Name>rhs</Name><Direction isExplicit=\"0\">in</Direction><Discussion><Para>Another value to compare.</Para></Discussion></Parameter></Parameters><Discussion><Para>Inequality is the inverse of equality. For any values <codeVoice>a</codeVoice> and <codeVoice>b</codeVoice>, <codeVoice>a != b</codeVoice> implies that <codeVoice>a == b</codeVoice> is <codeVoice>false</codeVoice>.</Para><Para>This is the default implementation of the not-equal-to operator (<codeVoice>!=</codeVoice>) for any type that conforms to <codeVoice>Equatable</codeVoice>.</Para></Discussion></CommentParts></Function>",
- key.offset: 7557,
+ key.offset: 7539,
key.length: 63,
key.fully_annotated_decl: "<decl.function.operator.infix><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_inlineable</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>static</syntaxtype.keyword> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>!= </decl.name>(<decl.var.parameter><decl.var.parameter.name>lhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooSubEnum1\">FooSubEnum1</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.name>rhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"c:@E@FooSubEnum1\">FooSubEnum1</ref.struct></decl.var.parameter.type></decl.var.parameter>) -> <decl.function.returntype><ref.struct usr=\"s:Sb\">Bool</ref.struct></decl.function.returntype></decl.function.operator.infix>",
key.entities: [
@@ -7185,14 +7178,14 @@
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "lhs",
- key.offset: 7580,
+ key.offset: 7562,
key.length: 11
},
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "rhs",
- key.offset: 7600,
+ key.offset: 7582,
key.length: 11
}
]
@@ -7204,7 +7197,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubEnum1X",
key.usr: "c:@E@FooSubEnum1@FooSubEnum1X",
- key.offset: 7623,
+ key.offset: 7605,
key.length: 37,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FooSubEnum1X</decl.name>: <decl.var.type><ref.struct usr=\"c:@E@FooSubEnum1\">FooSubEnum1</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>",
key.modulename: "Foo.FooSub"
@@ -7213,7 +7206,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubEnum1Y",
key.usr: "c:@E@FooSubEnum1@FooSubEnum1Y",
- key.offset: 7661,
+ key.offset: 7643,
key.length: 37,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FooSubEnum1Y</decl.name>: <decl.var.type><ref.struct usr=\"c:@E@FooSubEnum1\">FooSubEnum1</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>",
key.modulename: "Foo.FooSub"
@@ -7222,7 +7215,7 @@
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubUnnamedEnumeratorA1",
key.usr: "c:@Ea@FooSubUnnamedEnumeratorA1@FooSubUnnamedEnumeratorA1",
- key.offset: 7699,
+ key.offset: 7681,
key.length: 42,
key.fully_annotated_decl: "<decl.var.global><syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>FooSubUnnamedEnumeratorA1</decl.name>: <decl.var.type><ref.struct usr=\"s:Si\">Int</ref.struct></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.global>",
key.modulename: "Foo.FooSub"
diff --git a/test/TypeCoercion/integer_literals.swift b/test/TypeCoercion/integer_literals.swift
index ea17b97..1a5b9fa 100644
--- a/test/TypeCoercion/integer_literals.swift
+++ b/test/TypeCoercion/integer_literals.swift
@@ -47,7 +47,7 @@
struct supermeters : ExpressibleByIntegerLiteral { // expected-error{{type 'supermeters' does not conform to protocol 'ExpressibleByIntegerLiteral'}}
var value : meters
- typealias IntegerLiteralType = meters // expected-note{{possibly intended match 'supermeters.IntegerLiteralType' (aka 'meters') does not conform to '_ExpressibleByBuiltinIntegerLiteral'}}
+ typealias IntegerLiteralType = meters // expected-note{{possibly intended match 'IntegerLiteralType' (aka 'meters') does not conform to '_ExpressibleByBuiltinIntegerLiteral'}}
init(_integerLiteral value: meters) {
self.value = value
}
diff --git a/test/api-digester/Inputs/APINotesLeft/APINotesTest.h b/test/api-digester/Inputs/APINotesLeft/APINotesTest.h
index 90d5820..7b33a30 100644
--- a/test/api-digester/Inputs/APINotesLeft/APINotesTest.h
+++ b/test/api-digester/Inputs/APINotesLeft/APINotesTest.h
@@ -1,3 +1,4 @@
+#import <Foundation.h>
extern int ANTGlobalValue;
@interface NewType
@@ -16,3 +17,7 @@
-(void) ProtMemberFunc2;
-(void) ProtMemberFunc3;
@end
+
+@interface AnimalStatusDescriptor
+- (nonnull AnimalStatusDescriptor *)animalStatusDescriptorByAddingAttributes:(nonnull NSDictionary<NSString*, id> *)attributes;
+@end
diff --git a/test/api-digester/Inputs/APINotesRight/APINotesTest.h b/test/api-digester/Inputs/APINotesRight/APINotesTest.h
index a500614..7e882af 100644
--- a/test/api-digester/Inputs/APINotesRight/APINotesTest.h
+++ b/test/api-digester/Inputs/APINotesRight/APINotesTest.h
@@ -1,3 +1,4 @@
+#import <objc_generics.h>
extern int ANTGlobalValue;
@interface NewType
@@ -14,3 +15,9 @@
@protocol ObjcProt
-(void) ProtMemberFunc;
@end
+
+typedef NSString * AnimalAttributeName NS_STRING_ENUM;
+
+@interface AnimalStatusDescriptor
+- (nonnull AnimalStatusDescriptor *)animalStatusDescriptorByAddingAttributes:(nonnull NSDictionary<AnimalAttributeName, id> *)attributes;
+@end
diff --git a/test/api-digester/Inputs/cake.swift b/test/api-digester/Inputs/cake.swift
index 4644313..4cf3846 100644
--- a/test/api-digester/Inputs/cake.swift
+++ b/test/api-digester/Inputs/cake.swift
@@ -35,3 +35,5 @@
public enum Number: Int {
case one
}
+
+public func foo3(_ a: [Int: String]) {}
\ No newline at end of file
diff --git a/test/api-digester/Outputs/apinotes-diags.txt b/test/api-digester/Outputs/apinotes-diags.txt
index 9cd3b42..f5f0cb6 100644
--- a/test/api-digester/Outputs/apinotes-diags.txt
+++ b/test/api-digester/Outputs/apinotes-diags.txt
@@ -11,5 +11,6 @@
APINotesTest(APINotesTest.h): Protocol SwiftTypeWithMethodLeft has been renamed to Protocol SwiftTypeWithMethodRight
/* Type Changes */
+APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
/* Decl Attribute changes */
diff --git a/test/api-digester/Outputs/apinotes-migrator-gen.json b/test/api-digester/Outputs/apinotes-migrator-gen.json
index 86fd96d..c83b45f 100644
--- a/test/api-digester/Outputs/apinotes-migrator-gen.json
+++ b/test/api-digester/Outputs/apinotes-migrator-gen.json
@@ -2,6 +2,28 @@
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
+ "NodeAnnotation": "TypeRewritten",
+ "ChildIndex": "1:0",
+ "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributes:",
+ "LeftComment": "String",
+ "RightUsr": "",
+ "RightComment": "AnimalAttributeName",
+ "ModuleName": "APINotesTest"
+ },
+ {
+ "DiffItemKind": "CommonDiffItem",
+ "NodeKind": "Function",
+ "NodeAnnotation": "TypeRewritten",
+ "ChildIndex": "1:0",
+ "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributes:",
+ "LeftComment": "String",
+ "RightUsr": "",
+ "RightComment": "AnimalAttributeName",
+ "ModuleName": "APINotesTest"
+ },
+ {
+ "DiffItemKind": "CommonDiffItem",
+ "NodeKind": "Function",
"NodeAnnotation": "GetterToProperty",
"ChildIndex": "0",
"LeftUsr": "c:objc(pl)TypeWithMethod(im)getPropertyA",
diff --git a/test/api-digester/Outputs/cake.json b/test/api-digester/Outputs/cake.json
index 4960d67..27e1a01 100644
--- a/test/api-digester/Outputs/cake.json
+++ b/test/api-digester/Outputs/cake.json
@@ -43,6 +43,7 @@
"kind": "TypeNominal",
"name": "C0",
"printedName": "C0<T1, T2, T3>",
+ "usr": "s:4cake2C0C",
"children": [
{
"kind": "TypeNominal",
@@ -188,7 +189,8 @@
{
"kind": "TypeNominal",
"name": "S1",
- "printedName": "S1"
+ "printedName": "S1",
+ "usr": "s:4cake2S1V"
}
]
}
@@ -249,11 +251,13 @@
"kind": "TypeNominal",
"name": "Optional",
"printedName": "C1?",
+ "usr": "s:Sq",
"children": [
{
"kind": "TypeNominal",
"name": "C1",
- "printedName": "C1"
+ "printedName": "C1",
+ "usr": "s:4cake2C1C"
}
]
}
@@ -277,11 +281,13 @@
"kind": "TypeNominal",
"name": "Optional",
"printedName": "C1?",
+ "usr": "s:Sq",
"children": [
{
"kind": "TypeNominal",
"name": "C1",
- "printedName": "C1"
+ "printedName": "C1",
+ "usr": "s:4cake2C1C"
}
]
}
@@ -316,7 +322,8 @@
{
"kind": "TypeNominal",
"name": "C1",
- "printedName": "C1"
+ "printedName": "C1",
+ "usr": "s:4cake2C1C"
}
]
},
@@ -337,7 +344,8 @@
{
"kind": "TypeNominal",
"name": "C1",
- "printedName": "C1"
+ "printedName": "C1",
+ "usr": "s:4cake2C1C"
}
]
}
@@ -355,7 +363,8 @@
{
"kind": "TypeNominal",
"name": "C1",
- "printedName": "C1"
+ "printedName": "C1",
+ "usr": "s:4cake2C1C"
}
]
}
@@ -379,12 +388,14 @@
"kind": "TypeNominal",
"name": "Int",
"printedName": "Int",
- "hasDefaultArg": true
+ "hasDefaultArg": true,
+ "usr": "s:Si"
},
{
"kind": "TypeNominal",
"name": "S1",
- "printedName": "S1"
+ "printedName": "S1",
+ "usr": "s:4cake2S1V"
}
]
},
@@ -406,12 +417,50 @@
"kind": "TypeNominal",
"name": "Int",
"printedName": "Int",
- "hasDefaultArg": true
+ "hasDefaultArg": true,
+ "usr": "s:Si"
},
{
"kind": "TypeNominal",
"name": "S1",
- "printedName": "S1"
+ "printedName": "S1",
+ "usr": "s:4cake2S1V"
+ }
+ ]
+ },
+ {
+ "kind": "Function",
+ "name": "foo3",
+ "printedName": "foo3(_:)",
+ "declKind": "Func",
+ "usr": "s:4cake4foo3yys10DictionaryVySiSSGF",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Void",
+ "printedName": "()"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "Dictionary",
+ "printedName": "[Int : String]",
+ "usr": "s:s10DictionaryV",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "String",
+ "printedName": "String",
+ "usr": "s:SS"
+ }
+ ]
}
]
},
@@ -447,7 +496,8 @@
{
"kind": "TypeNominal",
"name": "Number",
- "printedName": "Number"
+ "printedName": "Number",
+ "usr": "s:4cake6NumberO"
},
{
"kind": "TypeNominal",
@@ -457,7 +507,8 @@
{
"kind": "TypeNominal",
"name": "Number",
- "printedName": "Number"
+ "printedName": "Number",
+ "usr": "s:4cake6NumberO"
}
]
}
@@ -477,7 +528,8 @@
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
}
]
},
@@ -493,7 +545,8 @@
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
},
{
"kind": "Getter",
@@ -507,7 +560,8 @@
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
}
]
}
@@ -526,18 +580,21 @@
"kind": "TypeNominal",
"name": "Optional",
"printedName": "Number?",
+ "usr": "s:Sq",
"children": [
{
"kind": "TypeNominal",
"name": "Number",
- "printedName": "Number"
+ "printedName": "Number",
+ "usr": "s:4cake6NumberO"
}
]
},
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
}
]
},
@@ -553,7 +610,8 @@
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
},
{
"kind": "Getter",
@@ -567,7 +625,8 @@
{
"kind": "TypeNominal",
"name": "Int",
- "printedName": "Int"
+ "printedName": "Int",
+ "usr": "s:Si"
}
]
}
diff --git a/test/api-digester/apinotes-diags.swift b/test/api-digester/apinotes-diags.swift
index e6f22c2..56930a6 100644
--- a/test/api-digester/apinotes-diags.swift
+++ b/test/api-digester/apinotes-diags.swift
@@ -2,7 +2,7 @@
// RUN: %empty-directory(%t.mod)
// RUN: %empty-directory(%t.sdk)
// RUN: %empty-directory(%t.module-cache)
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesRight
+// RUN: %api-digester %clang-importer-sdk-nosource -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -swift-version 3 -I %S/Inputs/APINotesLeft
+// RUN: %api-digester %clang-importer-sdk-nosource -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -swift-version 3 -I %S/Inputs/APINotesRight
// RUN: %api-digester -diagnose-sdk -print-module -input-paths %t.dump1.json -input-paths %t.dump2.json > %t.result
// RUN: diff -u %S/Outputs/apinotes-diags.txt %t.result
diff --git a/test/api-digester/apinotes-migrator-gen.swift b/test/api-digester/apinotes-migrator-gen.swift
index 24a93c2..df6a90d 100644
--- a/test/api-digester/apinotes-migrator-gen.swift
+++ b/test/api-digester/apinotes-migrator-gen.swift
@@ -2,7 +2,7 @@
// RUN: %empty-directory(%t.mod)
// RUN: %empty-directory(%t.sdk)
// RUN: %empty-directory(%t.module-cache)
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesRight
+// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %S/Inputs/APINotesLeft
+// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %S/Inputs/APINotesRight
// RUN: %api-digester -compare-sdk --input-paths %t.dump1.json -input-paths %t.dump2.json -o %t.result -json
// RUN: diff -u %S/Outputs/apinotes-migrator-gen.json %t.result
diff --git a/test/api-digester/compare-dump.swift b/test/api-digester/compare-dump.swift
index 514a605..b6e5adf 100644
--- a/test/api-digester/compare-dump.swift
+++ b/test/api-digester/compare-dump.swift
@@ -1,9 +1,9 @@
// RUN: %empty-directory(%t.mod)
// RUN: %empty-directory(%t.sdk)
// RUN: %empty-directory(%t.module-cache)
-// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -parse-as-library -I %S/Inputs/APINotesLeft
-// RUN: %swift -emit-module -o %t.mod/cake2.swiftmodule %S/Inputs/cake2.swift -parse-as-library -I %S/Inputs/APINotesRight
-// RUN: %api-digester -dump-sdk -module cake1 -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %t.mod -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module cake2 -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %t.mod -I %S/Inputs/APINotesRight
+// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -parse-as-library -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource
+// RUN: %swift -emit-module -o %t.mod/cake2.swiftmodule %S/Inputs/cake2.swift -parse-as-library -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource
+// RUN: %api-digester -dump-sdk -module cake1 -o %t.dump1.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %t.mod -I %S/Inputs/APINotesLeft
+// RUN: %api-digester -dump-sdk -module cake2 -o %t.dump2.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %t.mod -I %S/Inputs/APINotesRight
// RUN: %api-digester -diagnose-sdk -print-module --input-paths %t.dump1.json -input-paths %t.dump2.json > %t.result
// RUN: diff -u %S/Outputs/Cake.txt %t.result
diff --git a/test/decl/protocol/conforms/associated_type.swift b/test/decl/protocol/conforms/associated_type.swift
index 21e2a22..ee115d3 100644
--- a/test/decl/protocol/conforms/associated_type.swift
+++ b/test/decl/protocol/conforms/associated_type.swift
@@ -9,8 +9,8 @@
}
struct X : P { // expected-error{{type 'X' does not conform to protocol 'P'}}
- typealias AssocP = Int // expected-note{{possibly intended match 'X.AssocP' (aka 'Int') does not inherit from 'C'}}
- typealias AssocA = Int // expected-note{{possibly intended match 'X.AssocA' (aka 'Int') does not conform to 'AnyObject'}}
+ typealias AssocP = Int // expected-note{{possibly intended match 'AssocP' (aka 'Int') does not inherit from 'C'}}
+ typealias AssocA = Int // expected-note{{possibly intended match 'AssocA' (aka 'Int') does not conform to 'AnyObject'}}
}
// SR-5166
diff --git a/test/decl/protocol/protocols.swift b/test/decl/protocol/protocols.swift
index 8eb4fe0..e23c5e5 100644
--- a/test/decl/protocol/protocols.swift
+++ b/test/decl/protocol/protocols.swift
@@ -195,7 +195,7 @@
}
struct NotSequence : SequenceViaStream { // expected-error{{type 'NotSequence' does not conform to protocol 'SequenceViaStream'}}
- typealias SequenceStreamTypeType = Int // expected-note{{possibly intended match 'NotSequence.SequenceStreamTypeType' (aka 'Int') does not conform to 'IteratorProtocol'}}
+ typealias SequenceStreamTypeType = Int // expected-note{{possibly intended match 'SequenceStreamTypeType' (aka 'Int') does not conform to 'IteratorProtocol'}}
func makeIterator() -> Int {}
}
diff --git a/test/decl/typealias/generic.swift b/test/decl/typealias/generic.swift
index 4c97598..f19c2cf 100644
--- a/test/decl/typealias/generic.swift
+++ b/test/decl/typealias/generic.swift
@@ -308,7 +308,7 @@
typealias ErrorA<T: ErrorP> = T.X.Y
struct ErrorB : ErrorP { // expected-error {{type 'ErrorB' does not conform to protocol 'ErrorP'}}
- typealias X = ErrorC // expected-note {{possibly intended match 'ErrorB.X' (aka 'ErrorC') does not conform to 'ErrorQ'}}
+ typealias X = ErrorC // expected-note {{possibly intended match 'X' (aka 'ErrorC') does not conform to 'ErrorQ'}}
}
struct ErrorC {
diff --git a/test/decl/typealias/protocol.swift b/test/decl/typealias/protocol.swift
index 7a7a84f..4d577fc 100644
--- a/test/decl/typealias/protocol.swift
+++ b/test/decl/typealias/protocol.swift
@@ -251,7 +251,7 @@
}
func testT9a<T: P9, U>(_: T, _: U) where T.A == U { } // expected-error {{same-type requirement makes generic parameter 'U' non-generic}}
-func testT9b<T: P9>(_: T) where T.A == Float { } // expected-error{{generic signature requires types 'P9.A' (aka 'Int') and 'Float' to be the same}}
+func testT9b<T: P9>(_: T) where T.A == Float { } // expected-error{{generic signature requires types 'T.A' (aka 'Int') and 'Float' to be the same}}
struct X<T> { }
@@ -268,7 +268,7 @@
typealias U = Float
}
-extension P10 where T == Int { } // expected-warning{{neither type in same-type constraint ('P10.T' (aka 'Int') or 'Int') refers to a generic parameter or associated type}}
+extension P10 where T == Int { } // expected-warning{{neither type in same-type constraint ('Self.T' (aka 'Int') or 'Int') refers to a generic parameter or associated type}}
extension P10 where A == X<T> { }
@@ -277,7 +277,7 @@
extension P10 where A == X<Self.U> { }
extension P10 where V == Int { } // expected-warning 3{{'V' is deprecated: just use Int, silly}}
-// expected-warning@-1{{neither type in same-type constraint ('P10.V' (aka 'Int') or 'Int') refers to a generic parameter or associated type}}
+// expected-warning@-1{{neither type in same-type constraint ('Self.V' (aka 'Int') or 'Int') refers to a generic parameter or associated type}}
// rdar://problem/36003312
protocol P11 {
diff --git a/test/expr/capture/generic_params.swift b/test/expr/capture/generic_params.swift
index 4248c6e..27c07cd 100644
--- a/test/expr/capture/generic_params.swift
+++ b/test/expr/capture/generic_params.swift
@@ -26,7 +26,8 @@
// Make sure we look through typealiases
typealias TT = (a: T, b: T)
- // CHECK: func_decl "localFunction(tt:)" interface type='<T> (tt: TT) -> ()' {{.*}} captures=(<generic> )
+ // FIXME: Losing some type sugar here.
+ // CHECK: func_decl "localFunction(tt:)" interface type='<T> (tt: (a: T, b: T)) -> ()' {{.*}} captures=(<generic> )
func localFunction(tt: TT) {}
// CHECK: closure_expr type='((a: T, b: T)) -> ()' {{.*}} captures=(<generic> )
diff --git a/test/multifile/Inputs/external-protocol-conformance/A.swift b/test/multifile/Inputs/external-protocol-conformance/A.swift
index c1bdbf0..9ebec4d 100644
--- a/test/multifile/Inputs/external-protocol-conformance/A.swift
+++ b/test/multifile/Inputs/external-protocol-conformance/A.swift
@@ -6,5 +6,5 @@
}
struct A : P { // expected-error {{type 'A' does not conform to protocol 'P'}}
- typealias Assoc = Int // expected-note {{possibly intended match 'A.Assoc' (aka 'Int') does not conform to 'PHelper'}}
+ typealias Assoc = Int // expected-note {{possibly intended match 'Assoc' (aka 'Int') does not conform to 'PHelper'}}
}
diff --git a/test/stdlib/DictionaryLiteral.swift b/test/stdlib/DictionaryLiteral.swift
index 8fc3c88..8d30e36 100644
--- a/test/stdlib/DictionaryLiteral.swift
+++ b/test/stdlib/DictionaryLiteral.swift
@@ -49,8 +49,5 @@
var stringNSStringLet: DictionaryLiteral = [ "a": aString as NSString, "b": anNSString]
expectType(DictionaryLiteral<String, NSString>.self, &stringNSStringLet)
-var hetero1: DictionaryLiteral = ["a": 1 as NSNumber, "b": "Foo" as NSString]
-expectType(DictionaryLiteral<String, NSObject>.self, &hetero1)
-
-var hetero2: DictionaryLiteral = ["a": 1 as NSNumber, "b": "Foo" as NSString]
-expectType(DictionaryLiteral<String, NSObject>.self, &hetero2)
+var hetero: DictionaryLiteral = ["a": 1 as NSNumber, "b": "Foo" as NSString]
+expectType(DictionaryLiteral<String, NSObject>.self, &hetero)
diff --git a/test/stdlib/DoubleWidth.swift b/test/stdlib/DoubleWidth.swift
deleted file mode 100644
index 86b31fc..0000000
--- a/test/stdlib/DoubleWidth.swift
+++ /dev/null
@@ -1,379 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-import StdlibUnittest
-
-var dwTests = TestSuite("DoubleWidth")
-
-typealias UInt128 = DoubleWidth<UInt64>
-typealias UInt256 = DoubleWidth<UInt128>
-typealias UInt512 = DoubleWidth<UInt256>
-typealias UInt1024 = DoubleWidth<UInt512>
-
-typealias Int128 = DoubleWidth<Int64>
-typealias Int256 = DoubleWidth<Int128>
-typealias Int512 = DoubleWidth<Int256>
-typealias Int1024 = DoubleWidth<Int512>
-
-func checkSignedIntegerConformance<T: SignedInteger>(_ x: T) {}
-func checkUnsignedIntegerConformance<T: UnsignedInteger>(_ x: T) {}
-
-dwTests.test("Literals") {
- let w: DoubleWidth<UInt8> = 100
- expectTrue(w == 100 as Int)
-
- let x: DoubleWidth<UInt8> = 1000
- expectTrue(x == 1000 as Int)
-
- let y: DoubleWidth<Int8> = 1000
- expectTrue(y == 1000 as Int)
-
- let z: DoubleWidth<Int8> = -1000
- expectTrue(z == -1000 as Int)
-
- expectCrashLater()
- _ = -1 as DoubleWidth<UInt8>
-}
-
-dwTests.test("Literals/Large/Signed") {
- let a: Int256 =
- 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
- let b: Int256 =
- -0x8000000000000000000000000000000000000000000000000000000000000000
- expectEqual(a, Int256.max)
- expectEqual(b, Int256.min)
- expectCrashLater()
- _ = -0x8000000000000000000000000000000000000000000000000000000000000001
- as Int256
-}
-
-dwTests.test("Literals/Large/SignedOverflow") {
- expectCrashLater()
- _ = 0x8000000000000000000000000000000000000000000000000000000000000000
- as Int256
-}
-
-dwTests.test("Literals/Large/Unsigned") {
- let a: UInt256 =
- 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
- let b: UInt256 = 0
- expectEqual(a, UInt256.max)
- expectEqual(b, UInt256.min)
- expectCrashLater()
- _ = -1 as UInt256
-}
-
-dwTests.test("Literals/Large/UnsignedOverflow") {
- expectCrashLater()
- _ = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0
- as UInt256
-}
-
-dwTests.test("Arithmetic/unsigned") {
- let x: DoubleWidth<UInt8> = 1000
- let y: DoubleWidth<UInt8> = 1111
- expectEqual(x + 1, 1001)
- expectEqual(x + x, 2000)
- expectEqual(x - (1 as DoubleWidth<UInt8>), 999)
- expectEqual(x - x, 0)
- expectEqual(y - x, 111)
-
- expectEqual(x * 7, 7000)
- expectEqual(y * 7, 7777)
-
- expectEqual(x / 3, 333)
- expectEqual(x / x, 1)
- expectEqual(x / y, 0)
- expectEqual(y / x, 1)
-
- expectEqual(x % 3, 1)
- expectEqual(x % y, x)
-}
-
-dwTests.test("Arithmetic/signed") {
- let x: DoubleWidth<Int8> = 1000
- let y: DoubleWidth<Int8> = -1111
- expectEqual(x + 1, 1001)
- expectEqual(x + x, 2000)
- expectEqual(x - (1 as DoubleWidth<Int8>), 999)
- expectEqual(x - x, 0)
- expectEqual(0 - x, -1000)
- expectEqual(x + y, -111)
- expectEqual(x - y, 2111)
-
- expectEqual(x * 7, 7000)
- expectEqual(y * 7, -7777)
- expectEqual(x * -7, -7000)
- expectEqual(y * -7, 7777)
-
- expectEqual(x / 3, 333)
- expectEqual(x / -3, -333)
- expectEqual(x / x, 1)
- expectEqual(x / y, 0)
- expectEqual(y / x, -1)
- expectEqual(y / y, 1)
-
- expectEqual(x % 3, 1)
- expectEqual(x % -3, 1)
- expectEqual(y % 3, -1)
- expectEqual(y % -3, -1)
-
- expectEqual(-y, 1111)
- expectEqual(-x, -1000)
-}
-
-dwTests.test("Nested") {
- do {
- let x = UInt1024.max
- let (y, o) = x.addingReportingOverflow(1)
- expectEqual(y, 0)
- expectTrue(y == (0 as Int))
- expectTrue(o)
- }
-
- do {
- let x = Int1024.max
- let (y, o) = x.addingReportingOverflow(1)
- expectEqual(y, Int1024.min)
- expectLT(y, 0)
- expectTrue(y < (0 as Int))
- expectTrue(y < (0 as UInt))
- expectTrue(o)
- }
-
- expectFalse(UInt1024.isSigned)
- expectEqual(UInt1024.bitWidth, 1024)
- expectTrue(Int1024.isSigned)
- expectEqual(Int1024.bitWidth, 1024)
-
- expectEqualSequence(
- UInt1024.max.words, repeatElement(UInt.max, count: 1024 / UInt.bitWidth))
-}
-
-dwTests.test("inits") {
- typealias DWU16 = DoubleWidth<UInt8>
-
- expectTrue(DWU16(UInt16.max) == UInt16.max)
- expectNil(DWU16(exactly: UInt32.max))
- expectEqual(DWU16(truncatingIfNeeded: UInt64.max), DWU16.max)
-
- expectCrashLater()
- _ = DWU16(UInt32.max)
-}
-
-dwTests.test("Magnitude") {
- typealias DWU16 = DoubleWidth<UInt8>
- typealias DWI16 = DoubleWidth<Int8>
-
- expectTrue(DWU16.min.magnitude == UInt16.min.magnitude)
- expectTrue((42 as DWU16).magnitude == (42 as UInt16).magnitude)
- expectTrue(DWU16.max.magnitude == UInt16.max.magnitude)
-
- expectTrue(DWI16.min.magnitude == Int16.min.magnitude)
- expectTrue((-42 as DWI16).magnitude == (-42 as Int16).magnitude)
- expectTrue(DWI16().magnitude == Int16(0).magnitude) // See SR-6602.
- expectTrue((42 as DWI16).magnitude == (42 as Int16).magnitude)
- expectTrue(DWI16.max.magnitude == Int16.max.magnitude)
-}
-
-dwTests.test("TwoWords") {
- typealias DW = DoubleWidth<Int>
-
- expectEqual(-1 as DW, DW(truncatingIfNeeded: -1 as Int8))
-
- expectNil(Int(exactly: DW(Int.min) - 1))
- expectNil(Int(exactly: DW(Int.max) + 1))
-
- expectTrue(DW(Int.min) - 1 < Int.min)
- expectTrue(DW(Int.max) + 1 > Int.max)
-}
-
-dwTests.test("Bitshifts") {
- typealias DWU64 = DoubleWidth<DoubleWidth<DoubleWidth<UInt8>>>
- typealias DWI64 = DoubleWidth<DoubleWidth<DoubleWidth<Int8>>>
-
- func f<T: FixedWidthInteger, U: FixedWidthInteger>(_ x: T, type: U.Type) {
- let y = U(x)
- expectEqual(T.bitWidth, U.bitWidth)
- for i in -(T.bitWidth + 1)...(T.bitWidth + 1) {
- expectTrue(x << i == y << i)
- expectTrue(x >> i == y >> i)
-
- expectTrue(x &<< i == y &<< i)
- expectTrue(x &>> i == y &>> i)
- }
- }
-
- f(1 as UInt64, type: DWU64.self)
- f(~(~0 as UInt64 >> 1), type: DWU64.self)
- f(UInt64.max, type: DWU64.self)
- // 0b01010101_10100101_11110000_10100101_11110000_10100101_11110000_10100101
- f(17340530535757639845 as UInt64, type: DWU64.self)
-
- f(1 as Int64, type: DWI64.self)
- f(Int64.min, type: DWI64.self)
- f(Int64.max, type: DWI64.self)
- // 0b01010101_10100101_11110000_10100101_11110000_10100101_11110000_10100101
- f(6171603459878809765 as Int64, type: DWI64.self)
-}
-
-dwTests.test("Remainder/DividingBy0") {
- func f(_ x: Int1024, _ y: Int1024) -> Int1024 {
- return x % y
- }
- expectCrashLater()
- _ = f(42, 0)
-}
-
-dwTests.test("RemainderReportingOverflow/DividingByMinusOne") {
- func f(_ x: Int256, _ y: Int256) -> Int256 {
- return x.remainderReportingOverflow(dividingBy: y).partialValue
- }
- expectEqual(f(.max, -1), 0)
- expectEqual(f(.min, -1), 0)
-}
-
-dwTests.test("Division/By0") {
- func f(_ x: Int1024, _ y: Int1024) -> Int1024 {
- return x / y
- }
- expectCrashLater()
- _ = f(42, 0)
-}
-
-dwTests.test("DivideMinByMinusOne") {
- func f(_ x: Int1024) -> Int1024 {
- return x / -1
- }
- expectCrashLater()
- _ = f(Int1024.min)
-}
-
-dwTests.test("MultiplyMinByMinusOne") {
- func f(_ x: Int1024) -> Int1024 {
- return x * -1
- }
- expectCrashLater()
- _ = f(Int1024.min)
-}
-
-typealias DWI16 = DoubleWidth<Int8>
-typealias DWU16 = DoubleWidth<UInt8>
-
-dwTests.test("Conversions") {
- expectTrue(DWI16(1 << 15 - 1) == Int(1 << 15 - 1))
- expectTrue(DWI16(-1 << 15) == Int(-1 << 15))
- expectTrue(DWU16(1 << 16 - 1) == Int(1 << 16 - 1))
- expectTrue(DWU16(0) == Int(0))
-
- expectTrue(DWI16(Double(1 << 15 - 1)) == Int(1 << 15 - 1))
- expectTrue(DWI16(Double(-1 << 15)) == Int(-1 << 15))
- expectTrue(DWU16(Double(1 << 16 - 1)) == Int(1 << 16 - 1))
- expectTrue(DWU16(Double(0)) == Int(0))
-
- expectTrue(DWI16(Double(1 << 15 - 1) + 0.9) == Int(1 << 15 - 1))
- expectTrue(DWI16(Double(-1 << 15) - 0.9) == Int(-1 << 15))
- expectTrue(DWU16(Double(1 << 16 - 1) + 0.9) == Int(1 << 16 - 1))
- expectTrue(DWU16(Double(0) - 0.9) == Int(0))
-
- expectEqual(DWI16(0.00001), 0)
- expectEqual(DWU16(0.00001), 0)
-}
-
-dwTests.test("Exact Conversions") {
- expectEqual(DWI16(Double(1 << 15 - 1)), DWI16(exactly: Double(1 << 15 - 1))!)
- expectEqual(DWI16(Double(-1 << 15)), DWI16(exactly: Double(-1 << 15))!)
- expectEqual(DWU16(Double(1 << 16 - 1)), DWU16(exactly: Double(1 << 16 - 1))!)
- expectEqual(DWU16(Double(0)), DWU16(exactly: Double(0))!)
-
- expectNil(DWI16(exactly: Double(1 << 15 - 1) + 0.9))
- expectNil(DWI16(exactly: Double(-1 << 15) - 0.9))
- expectNil(DWU16(exactly: Double(1 << 16 - 1) + 0.9))
- expectNil(DWU16(exactly: Double(0) - 0.9))
-
- expectNil(DWI16(exactly: Double(1 << 15)))
- expectNil(DWI16(exactly: Double(-1 << 15) - 1))
- expectNil(DWU16(exactly: Double(1 << 16)))
- expectNil(DWU16(exactly: Double(-1)))
-
- expectNil(DWI16(exactly: 0.00001))
- expectNil(DWU16(exactly: 0.00001))
-
- expectNil(DWU16(exactly: Double.nan))
- expectNil(DWU16(exactly: Float.nan))
- expectNil(DWU16(exactly: Double.infinity))
- expectNil(DWU16(exactly: Float.infinity))
-}
-
-dwTests.test("Conversions/SignedMax+1") {
- expectCrashLater()
- _ = DWI16(1 << 15)
-}
-
-dwTests.test("Conversions/SignedMin-1") {
- expectCrashLater()
- _ = DWI16(-1 << 15 - 1)
-}
-
-dwTests.test("Conversions/UnsignedMax+1") {
- expectCrashLater()
- _ = DWU16(1 << 16)
-}
-
-dwTests.test("Conversions/Unsigned-1") {
- expectCrashLater()
- _ = DWU16(-1)
-}
-
-dwTests.test("Conversions/String") {
- expectEqual(String(Int256.max, radix: 16),
- "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
- expectEqual(String(Int256.min, radix: 16),
- "-8000000000000000000000000000000000000000000000000000000000000000")
-
- expectEqual(String(Int256.max, radix: 2), """
- 1111111111111111111111111111111111111111111111111111111111111111\
- 1111111111111111111111111111111111111111111111111111111111111111\
- 1111111111111111111111111111111111111111111111111111111111111111\
- 111111111111111111111111111111111111111111111111111111111111111
- """)
- expectEqual(String(Int256.min, radix: 2), """
- -100000000000000000000000000000000000000000000000000000000000000\
- 0000000000000000000000000000000000000000000000000000000000000000\
- 0000000000000000000000000000000000000000000000000000000000000000\
- 00000000000000000000000000000000000000000000000000000000000000000
- """)
-
- expectEqual(String(Int128.max, radix: 10),
- "170141183460469231731687303715884105727")
- expectEqual(String(Int128.min, radix: 10),
- "-170141183460469231731687303715884105728")
-}
-
-dwTests.test("Words") {
- expectEqualSequence((0 as DoubleWidth<Int8>).words, [0])
- expectEqualSequence((1 as DoubleWidth<Int8>).words, [1])
- expectEqualSequence((-1 as DoubleWidth<Int8>).words, [UInt.max])
- expectEqualSequence((256 as DoubleWidth<Int8>).words, [256])
- expectEqualSequence((-256 as DoubleWidth<Int8>).words, [UInt.max - 255])
- expectEqualSequence(DoubleWidth<Int8>.max.words, [32767])
- expectEqualSequence(DoubleWidth<Int8>.min.words, [UInt.max - 32767])
-
- expectEqualSequence((0 as Int1024).words,
- repeatElement(0 as UInt, count: 1024 / UInt.bitWidth))
- expectEqualSequence((-1 as Int1024).words,
- repeatElement(UInt.max, count: 1024 / UInt.bitWidth))
- expectEqualSequence((1 as Int1024).words,
- [1] + Array(repeating: 0, count: 1024 / UInt.bitWidth - 1))
-}
-
-dwTests.test("Conditional Conformance") {
- checkSignedIntegerConformance(0 as Int128)
- checkSignedIntegerConformance(0 as Int1024)
-
- checkUnsignedIntegerConformance(0 as UInt128)
- checkUnsignedIntegerConformance(0 as UInt1024)
-}
-
-runAllTests()
-
diff --git a/test/stdlib/FloatingPoint.swift.gyb b/test/stdlib/FloatingPoint.swift.gyb
index d702e5e..fa98f1b 100644
--- a/test/stdlib/FloatingPoint.swift.gyb
+++ b/test/stdlib/FloatingPoint.swift.gyb
@@ -105,11 +105,14 @@
expectEqual(Float._convert(from: Int64.max).value, Float(Int64.max))
expectEqual(Float._convert(from: Int64.min).value, Float(Int64.min))
+// FIXME: DoubleWidth is no longer part of the standard library
+#if false
expectEqual(Float._convert(from: DoubleWidth<UInt64>.max).value, .infinity)
expectEqual(
Float._convert(from: DoubleWidth<DoubleWidth<Int64>>.max).value, .infinity)
expectEqual(
Float._convert(from: DoubleWidth<DoubleWidth<Int64>>.min).value, -.infinity)
+#endif
}
FloatingPoint.test("BinaryFloatingPoint/genericFloatingPointConversion") {
diff --git a/test/stdlib/Integers.swift.gyb b/test/stdlib/Integers.swift.gyb
index 4238511..f16ac27 100644
--- a/test/stdlib/Integers.swift.gyb
+++ b/test/stdlib/Integers.swift.gyb
@@ -890,6 +890,8 @@
expectEqual(
Int((42 as MockBinaryInteger<UInt>)._binaryLogarithm()),
Int((42 as UInt)._binaryLogarithm()))
+// FIXME: DoubleWidth is no longer part of the standard library
+#if false
expectEqual(
Int((42 as MockBinaryInteger<DoubleWidth<Int>>)._binaryLogarithm()),
Int((42 as DoubleWidth<Int>)._binaryLogarithm()))
@@ -900,6 +902,7 @@
Int((42 as MockBinaryInteger<DoubleWidth<DoubleWidth<Int>>>)
._binaryLogarithm()),
Int((42 as DoubleWidth<DoubleWidth<Int>>)._binaryLogarithm()))
+#endif
}
runAllTests()
diff --git a/test/stmt/foreach.swift b/test/stmt/foreach.swift
index 2394502..3f97744 100644
--- a/test/stmt/foreach.swift
+++ b/test/stmt/foreach.swift
@@ -27,7 +27,7 @@
struct BadIterator1 {}
struct BadContainer4 : Sequence { // expected-error{{type 'BadContainer4' does not conform to protocol 'Sequence'}}
- typealias Iterator = BadIterator1 // expected-note{{possibly intended match 'BadContainer4.Iterator' (aka 'BadIterator1') does not conform to 'IteratorProtocol'}}
+ typealias Iterator = BadIterator1 // expected-note{{possibly intended match 'Iterator' (aka 'BadIterator1') does not conform to 'IteratorProtocol'}}
func makeIterator() -> BadIterator1 { }
}
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
index 41a74fb..aa162a8 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
@@ -455,10 +455,8 @@
}
static const TypeDecl *getTypeDeclFromType(Type Ty) {
- if (auto Alias = dyn_cast<NameAliasType>(Ty.getPointer()))
- return Alias->getDecl();
- if (auto BoundAlias = dyn_cast<BoundNameAliasType>(Ty.getPointer()))
- return BoundAlias->getDecl();
+ if (auto alias = dyn_cast<NameAliasType>(Ty.getPointer()))
+ return alias->getDecl();
return Ty->getAnyNominal();
}
diff --git a/tools/SwiftSyntax/Diagnostic.swift b/tools/SwiftSyntax/Diagnostic.swift
index e02596c..1fd2869 100644
--- a/tools/SwiftSyntax/Diagnostic.swift
+++ b/tools/SwiftSyntax/Diagnostic.swift
@@ -29,6 +29,12 @@
/// The file in which this location resides.
public let file: String
+ public init(file: String, position: AbsolutePosition) {
+ assert(position is UTF8Position, "must be utf8 position")
+ self.init(line: position.line, column: position.column,
+ offset: position.byteOffset, file: file)
+ }
+
public init(line: Int, column: Int, offset: Int, file: String) {
self.line = line
self.column = column
diff --git a/tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp b/tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
index ce74011..a162096 100644
--- a/tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
+++ b/tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
@@ -138,6 +138,10 @@
llvm::cl::opt<std::string> DumpTypeFromMangled(
"type-from-mangled", llvm::cl::desc("dump type from mangled names list"));
+ // FIXME: we should infer this from the module.
+ llvm::cl::opt<std::string> TargetTriple(
+ "target-triple", llvm::cl::desc("specify target triple"));
+
llvm::cl::ParseCommandLineOptions(argc, argv);
// Unregister our options so they don't interfere with the command line
// parsing in CodeGen/BackendUtil.cpp.
@@ -148,6 +152,7 @@
DumpTypeFromMangled.removeArgument();
SDK.removeArgument();
InputNames.removeArgument();
+ TargetTriple.removeArgument();
// If no SDK was specified via -sdk, check environment variable SDKROOT.
if (SDK.getNumOccurrences() == 0) {
@@ -166,7 +171,13 @@
reinterpret_cast<void *>(&anchorForGetMainExecutable)));
Invocation.setSDKPath(SDK);
- Invocation.setTargetTriple(llvm::sys::getDefaultTargetTriple());
+
+ // FIXME: we should infer this from the module.
+ if (!TargetTriple.empty())
+ Invocation.setTargetTriple(TargetTriple);
+ else
+ Invocation.setTargetTriple(llvm::sys::getDefaultTargetTriple());
+
Invocation.setModuleName("lldbtest");
Invocation.getClangImporterOptions().ModuleCachePath = ModuleCachePath;
Invocation.setImportSearchPaths(ImportPaths);
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
index ec92d6d..e0a5f6f 100644
--- a/tools/swift-api-digester/swift-api-digester.cpp
+++ b/tools/swift-api-digester/swift-api-digester.cpp
@@ -511,9 +511,12 @@
}
class SDKNodeTypeNominal : public SDKNodeType {
+ StringRef USR;
public:
SDKNodeTypeNominal(SDKNodeInitInfo Info) : SDKNodeType(Info,
- SDKNodeKind::TypeNominal) {}
+ SDKNodeKind::TypeNominal), USR(Info.USR) {}
+ // Get the usr of the correspoding nominal type decl.
+ StringRef getUsr() const { return USR; }
static bool classof(const SDKNode *N);
};
@@ -1158,9 +1161,6 @@
if (auto *NAT = dyn_cast<NameAliasType>(Ty.getPointer())) {
return NAT->getDecl()->getNameStr();
}
- if (auto *BNAT = dyn_cast<BoundNameAliasType>(Ty.getPointer())) {
- return BNAT->getDecl()->getNameStr();
- }
if (Ty->getAnyNominal()) {
if (IsImplicitlyUnwrappedOptional) {
assert(Ty->getOptionalObjectType());
@@ -1286,6 +1286,10 @@
TypeInfo(TypeInfo) {
if (isFunctionTypeNoEscape(Ty))
TypeAttrs.push_back(TypeAttrKind::TAK_noescape);
+ // If this is a nominal type, get its Usr.
+ if (auto *ND = Ty->getAnyNominal()) {
+ USR = calculateUsr(Ctx, ND);
+ }
}
SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD)
@@ -1363,11 +1367,6 @@
Root->addChild(constructTypeNode(Ctx, NAT->getCanonicalType()));
return Root;
}
- if (auto BNAT = dyn_cast<BoundNameAliasType>(T.getPointer())) {
- SDKNode* Root = SDKNodeInitInfo(Ctx, T).createSDKNode(SDKNodeKind::TypeNameAlias);
- Root->addChild(constructTypeNode(Ctx, BNAT->getCanonicalType()));
- return Root;
- }
if (auto Fun = T->getAs<AnyFunctionType>()) {
SDKNode* Root = SDKNodeInitInfo(Ctx, T).createSDKNode(SDKNodeKind::TypeFunc);
@@ -1760,6 +1759,12 @@
out.mapRequired(getKeyContent(Ctx, KeyKind::KK_hasDefaultArg).data(),
HasDefault);
}
+ // Serialize nominal type's USR.
+ if (auto NT = dyn_cast<SDKNodeTypeNominal>(value)) {
+ auto Usr = NT->getUsr();
+ if (!Usr.empty())
+ out.mapRequired(getKeyContent(Ctx, KeyKind::KK_usr).data(), Usr);
+ }
}
if (!value->isLeaf()) {
ArrayRef<SDKNode *> Children = value->getChildren();
@@ -3424,7 +3429,7 @@
llvm::errs() << "Dumping diff to " << DiffPath << '\n';
std::vector<OverloadedFuncInfo> Overloads;
- OverloadMemberFunctionEmitter::collectDiffItems(RightModule, Overloads);
+ // OverloadMemberFunctionEmitter::collectDiffItems(RightModule, Overloads);
std::error_code EC;
llvm::raw_fd_ostream Fs(DiffPath, EC, llvm::sys::fs::F_None);
diff --git a/tools/swift-demangle/swift-demangle.cpp b/tools/swift-demangle/swift-demangle.cpp
index 8fdbd85..00e2160 100644
--- a/tools/swift-demangle/swift-demangle.cpp
+++ b/tools/swift-demangle/swift-demangle.cpp
@@ -175,7 +175,7 @@
// This doesn't handle Unicode symbols, but maybe that's okay.
// Also accept the future mangling prefix.
// TODO: remove the "_S" as soon as MANGLING_PREFIX_STR gets "_S".
- llvm::Regex maybeSymbol("(_T|_*\\$S|" MANGLING_PREFIX_STR ")[_a-zA-Z0-9$.]+");
+ llvm::Regex maybeSymbol("(_T|_?\\$[Ss])[_a-zA-Z0-9$.]+");
swift::Demangle::Context DCtx;
for (std::string mangled; std::getline(std::cin, mangled);) {
@@ -213,7 +213,12 @@
} else {
swift::Demangle::Context DCtx;
for (llvm::StringRef name : InputNames) {
- demangle(llvm::outs(), name, DCtx, options);
+ if (name.startswith("S")) {
+ std::string correctedName = std::string("$") + name.str();
+ demangle(llvm::outs(), correctedName, DCtx, options);
+ } else {
+ demangle(llvm::outs(), name, DCtx, options);
+ }
llvm::outs() << '\n';
}
diff --git a/unittests/SwiftDemangle/DemangleTest.cpp b/unittests/SwiftDemangle/DemangleTest.cpp
index c495600..ee9f8b4 100644
--- a/unittests/SwiftDemangle/DemangleTest.cpp
+++ b/unittests/SwiftDemangle/DemangleTest.cpp
@@ -42,6 +42,7 @@
char OutputBuffer[128];
const char *FunctionName = "$S1a10run_MatMulyySiF";
+ const char *FunctionNameNew = "$s1a10run_MatMulyySiF";
const char *DemangledName = "a.run_MatMul(Swift.Int) -> ()";
const char *SimplifiedName = "run_MatMul(_:)";
@@ -51,6 +52,12 @@
EXPECT_STREQ(DemangledName, OutputBuffer);
EXPECT_EQ(Result, strlen(DemangledName));
+ Result = swift_demangle_getDemangledName(FunctionNameNew, OutputBuffer,
+ sizeof(OutputBuffer));
+
+ EXPECT_STREQ(DemangledName, OutputBuffer);
+ EXPECT_EQ(Result, strlen(DemangledName));
+
Result = swift_demangle_getSimplifiedDemangledName(FunctionName, OutputBuffer,
sizeof(OutputBuffer));
diff --git a/utils/build-script-impl b/utils/build-script-impl
index 6b8ddfd..827355b 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -2864,7 +2864,7 @@
-E "${DOTEST_EXTRA}"
else
with_pushd "${results_dir}" \
- call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
+ call env SWIFTC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
SWIFTLIBS="${swift_build_dir}/lib/swift" \
"${LLDB_SOURCE_DIR}"/test/dotest.py \
--executable "${lldb_executable}" \
diff --git a/validation-test/Serialization/rdar29694978.swift b/validation-test/Serialization/rdar29694978.swift
index 9530375..8e92b38 100644
--- a/validation-test/Serialization/rdar29694978.swift
+++ b/validation-test/Serialization/rdar29694978.swift
@@ -22,7 +22,7 @@
// CHECK-DAG: typealias MyGenericType<T> = GenericType<T>
typealias MyGenericType<T: NSObject> = GenericType<T>
-// CHECK-DAG: extension GenericType where Element : AnyObject
+// CHECK-DAG: extension GenericType where Element : NSObject
extension MyGenericType {}
// CHECK-DAG: extension GenericType where Element == NSObject
extension MyGenericType where Element == NSObject {}
diff --git a/validation-test/compiler_crashers_2_fixed/0148-rdar35773761.swift b/validation-test/compiler_crashers_2_fixed/0148-rdar35773761.swift
new file mode 100644
index 0000000..effe05a
--- /dev/null
+++ b/validation-test/compiler_crashers_2_fixed/0148-rdar35773761.swift
@@ -0,0 +1,4 @@
+// RUN: %target-typecheck-verify-swift %s
+
+let b: () -> Void = withoutActuallyEscaping({ print("hello crash") }, do: { $0() })
+// expected-error@-1 {{cannot convert value of type '()' to specified type '() -> Void'}}
diff --git a/validation-test/compiler_crashers/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift b/validation-test/compiler_crashers_fixed/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift
similarity index 87%
rename from validation-test/compiler_crashers/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift
rename to validation-test/compiler_crashers_fixed/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift
index f8e1032..e005597 100644
--- a/validation-test/compiler_crashers/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift
+++ b/validation-test/compiler_crashers_fixed/28800-unreachable-executed-at-swift-lib-ast-type-cpp-3247.swift
@@ -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
a.e{}class a<a{typealias e:a
