Merge pull request #19189 from graydon/rdar-43804798-implements-binds-tighter-when-protocol-requirement-matches
[SR-8081] Prefer @_implements(P,q) over q, when requirement is P.q exactly.
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index 4f97023..cfc1e80 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -132,10 +132,11 @@
endif()
if("${CFLAGS_SDK}" STREQUAL "ANDROID")
- list(APPEND result
- "--sysroot=${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_PATH}"
- # Use the linker included in the Android NDK.
- "-B" "${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_PREBUILT_PATH}/${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_TRIPLE}/bin/")
+ # lld can handle targeting the android build. However, if lld is not
+ # enabled, then fallback to the linker included in the android NDK.
+ if(NOT SWIFT_ENABLE_LLD_LINKER)
+ list(APPEND result "-B" "${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_PREBUILT_PATH}/${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_TRIPLE}/bin")
+ endif()
endif()
if(IS_DARWIN)
diff --git a/docs/WindowsBuild.md b/docs/WindowsBuild.md
index 5f3fa60..7193e47 100644
--- a/docs/WindowsBuild.md
+++ b/docs/WindowsBuild.md
@@ -233,12 +233,12 @@
cmake -G "Ninja" "%swift_source_dir%/swift"^
-DCMAKE_BUILD_TYPE=Debug^
-DSWIFT_PATH_TO_CMARK_SOURCE="%swift_source_dir%/cmark"^
- -DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/cmark-windows-amd64"^
- -DSWIFT_CMARK_LIBRARY_DIR="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/cmark-windows-amd64/src"^
+ -DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64"^
+ -DSWIFT_CMARK_LIBRARY_DIR="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64/src"^
-DSWIFT_PATH_TO_LLVM_SOURCE="%swift_source_dir%/llvm"^
- -DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/llvm-windows-amd64"^
+ -DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
-DSWIFT_PATH_TO_CLANG_SOURCE="%swift_source_dir%/llvm/tools/clang"^
- -DSWIFT_PATH_TO_CLANG_BUILD="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/llvm-windows-amd64"^
+ -DSWIFT_PATH_TO_CLANG_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"^
-DICU_UC_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
-DICU_UC_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
-DICU_I18N_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
diff --git a/foo.swift b/foo.swift
deleted file mode 100644
index 3624ef0..0000000
--- a/foo.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-
-enum SinglePayloadGenericEnumWithDefaultMirror<T, U> {
- case Well
- case Faucet
- case Pipe(T, U)
-}
-
-func foo(x: Int, y: [Int], out: (SinglePayloadGenericEnumWithDefaultMirror<Int, [Int]>) -> ()) {
- out(.Well)
- out(.Faucet)
- out(.Pipe(x, y))
-}
-
-func bar<T, U>(_ x: SinglePayloadGenericEnumWithDefaultMirror<T, U>) {
- switch x {
- case .Well:
- print("well")
- case .Faucet:
- print("faucet")
- case .Pipe:
- print("pipe")
- }
-}
-
-foo(x: 1, y: [1,2,3], out: bar)
diff --git a/include/swift/AST/DiagnosticsModuleDiffer.def b/include/swift/AST/DiagnosticsModuleDiffer.def
index 8b7d9b4..9484f18 100644
--- a/include/swift/AST/DiagnosticsModuleDiffer.def
+++ b/include/swift/AST/DiagnosticsModuleDiffer.def
@@ -42,6 +42,8 @@
ERROR(removed_decl,none,"%0 has been removed%select{| (deprecated)}1", (StringRef, bool))
+ERROR(removed_setter,none,"%0 has removed its setter", (StringRef))
+
ERROR(moved_decl,none,"%0 has been moved to %1", (StringRef, StringRef))
ERROR(renamed_decl,none,"%0 has been renamed to %1", (StringRef, StringRef))
@@ -62,6 +64,8 @@
ERROR(conformance_added,none,"%0 has added inherited protocol %1", (StringRef, StringRef))
+ERROR(default_associated_type_removed,none,"%0 has removed default type %1", (StringRef, StringRef))
+
#ifndef DIAG_NO_UNDEF
# if defined(DIAG)
# undef DIAG
diff --git a/include/swift/IDE/DigesterEnums.def b/include/swift/IDE/DigesterEnums.def
index f730523..b716f2d 100644
--- a/include/swift/IDE/DigesterEnums.def
+++ b/include/swift/IDE/DigesterEnums.def
@@ -45,6 +45,8 @@
NODE_KIND(DeclSetter, Setter)
NODE_KIND(DeclVar, Var)
NODE_KIND(DeclTypeAlias, TypeAlias)
+NODE_KIND(DeclAssociatedType, AssociatedType)
+NODE_KIND(DeclSubscript, Subscript)
NODE_ANNOTATION(Added)
NODE_ANNOTATION(Removed)
@@ -111,6 +113,7 @@
KEY(enumRawTypeName)
KEY(genericSig)
KEY(fixedbinaryorder)
+KEY(hasSetter)
KNOWN_TYPE(Optional)
KNOWN_TYPE(ImplicitlyUnwrappedOptional)
diff --git a/include/swift/Runtime/Atomic.h b/include/swift/Runtime/Atomic.h
index 3f9c1a3..655078a 100644
--- a/include/swift/Runtime/Atomic.h
+++ b/include/swift/Runtime/Atomic.h
@@ -22,7 +22,7 @@
// is formally UB by C++11 language rules, we should be OK because neither
// the processor model nor the optimizer can realistically reorder our uses
// of 'consume'.
-#if __arm64__ || __arm__
+#if defined(__arm__) || defined(_M_ARM) || defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
# define SWIFT_MEMORY_ORDER_CONSUME (std::memory_order_relaxed)
#else
# define SWIFT_MEMORY_ORDER_CONSUME (std::memory_order_consume)
diff --git a/include/swift/SIL/SILArgumentArrayRef.h b/include/swift/SIL/SILArgumentArrayRef.h
new file mode 100644
index 0000000..a4d8245
--- /dev/null
+++ b/include/swift/SIL/SILArgumentArrayRef.h
@@ -0,0 +1,41 @@
+//===--- SILArgumentArrayRef.h --------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+///
+/// A header file to ensure that we do not create a dependency cycle in between
+/// SILBasicBlock.h and SILInstruction.h.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SIL_SILARGUMENTARRAYREF_H
+#define SWIFT_SIL_SILARGUMENTARRAYREF_H
+
+#include "swift/Basic/LLVM.h"
+#include "swift/Basic/STLExtras.h"
+#include "swift/Basic/TransformArrayRef.h"
+
+namespace swift {
+
+class SILArgument;
+class SILPHIArgument;
+class SILFunctionArgument;
+
+using PHIArgumentArrayRef =
+ TransformArrayRef<function_ref<SILPHIArgument *(SILArgument *)>>;
+
+using FunctionArgumentArrayRef =
+ TransformArrayRef<function_ref<SILFunctionArgument *(SILArgument *)>>;
+
+} // namespace swift
+
+#endif
diff --git a/include/swift/SIL/SILBasicBlock.h b/include/swift/SIL/SILBasicBlock.h
index d0c00ce..c7f9874 100644
--- a/include/swift/SIL/SILBasicBlock.h
+++ b/include/swift/SIL/SILBasicBlock.h
@@ -20,6 +20,7 @@
#include "swift/Basic/Compiler.h"
#include "swift/Basic/Range.h"
#include "swift/Basic/TransformArrayRef.h"
+#include "swift/SIL/SILArgumentArrayRef.h"
#include "swift/SIL/SILInstruction.h"
namespace swift {
@@ -192,12 +193,15 @@
}
ArrayRef<SILArgument *> getArguments() const { return ArgumentList; }
- using PHIArgumentArrayRefTy =
- TransformArrayRef<SILPHIArgument *(*)(SILArgument *)>;
- PHIArgumentArrayRefTy getPHIArguments() const;
- using FunctionArgumentArrayRefTy =
- TransformArrayRef<SILFunctionArgument *(*)(SILArgument *)>;
- FunctionArgumentArrayRefTy getFunctionArguments() const;
+
+ /// Returns a transform array ref that performs llvm::cast<SILPHIArgument> on
+ /// each argument and then returns the downcasted value.
+ PHIArgumentArrayRef getPHIArguments() const;
+
+ /// Returns a transform array ref that performs
+ /// llvm::cast<SILFunctionArgument> on each argument and then returns the
+ /// downcasted value.
+ FunctionArgumentArrayRef getFunctionArguments() const;
unsigned getNumArguments() const { return ArgumentList.size(); }
const SILArgument *getArgument(unsigned i) const { return ArgumentList[i]; }
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
index 48f17dd..4c473d0 100644
--- a/include/swift/SIL/SILInstruction.h
+++ b/include/swift/SIL/SILInstruction.h
@@ -29,6 +29,7 @@
#include "swift/Basic/Range.h"
#include "swift/SIL/Consumption.h"
#include "swift/SIL/SILAllocated.h"
+#include "swift/SIL/SILArgumentArrayRef.h"
#include "swift/SIL/SILDeclRef.h"
#include "swift/SIL/SILFunctionConventions.h"
#include "swift/SIL/SILLocation.h"
@@ -6605,6 +6606,14 @@
});
}
+ using SuccessorBlockArgumentsListTy =
+ TransformRange<ConstSuccessorListTy,
+ function_ref<PHIArgumentArrayRef(const SILSuccessor &)>>;
+
+ /// Return the range of Argument arrays for each successor of this
+ /// block.
+ SuccessorBlockArgumentsListTy getSuccessorBlockArguments() const;
+
using SuccessorBlockListTy =
TransformRange<SuccessorListTy,
SILBasicBlock *(*)(const SILSuccessor &)>;
diff --git a/lib/Basic/SourceLoc.cpp b/lib/Basic/SourceLoc.cpp
index 7c5c801..a5791c3 100644
--- a/lib/Basic/SourceLoc.cpp
+++ b/lib/Basic/SourceLoc.cpp
@@ -320,11 +320,10 @@
const char *Ptr = InputBuf->getBufferStart();
const char *End = InputBuf->getBufferEnd();
const char *LineStart = Ptr;
- for (; Ptr < End; ++Ptr) {
+ --Line;
+ for (; Line && (Ptr < End); ++Ptr) {
if (*Ptr == '\n') {
--Line;
- if (Line == 0)
- break;
LineStart = Ptr+1;
}
}
diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
index b614aa0..c09b288 100644
--- a/lib/Parse/Lexer.cpp
+++ b/lib/Parse/Lexer.cpp
@@ -1817,6 +1817,12 @@
// Successfully scanned the body of the expression literal.
++CurPtr;
continue;
+ } else if ((*CurPtr == '\r' || *CurPtr == '\n') && IsMultilineString) {
+ // The only case we reach here is unterminated single line string in the
+ // interpolation. For better recovery, go on after emitting an error.
+ diagnose(CurPtr, diag::lex_unterminated_string);
+ wasErroneous = true;
+ continue;
}
// Being diagnosed below.
diff --git a/lib/SIL/SILBasicBlock.cpp b/lib/SIL/SILBasicBlock.cpp
index 4ee0bdd..7d6d6b4 100644
--- a/lib/SIL/SILBasicBlock.cpp
+++ b/lib/SIL/SILBasicBlock.cpp
@@ -335,18 +335,17 @@
return this == &*getParent()->begin();
}
-SILBasicBlock::PHIArgumentArrayRefTy SILBasicBlock::getPHIArguments() const {
- return PHIArgumentArrayRefTy(getArguments(),
- [](SILArgument *A) -> SILPHIArgument * {
- return cast<SILPHIArgument>(A);
+/// Declared out of line so we can have a declaration of SILArgument.
+PHIArgumentArrayRef SILBasicBlock::getPHIArguments() const {
+ return PHIArgumentArrayRef(getArguments(), [](SILArgument *arg) {
+ return cast<SILPHIArgument>(arg);
});
}
-SILBasicBlock::FunctionArgumentArrayRefTy
-SILBasicBlock::getFunctionArguments() const {
- return FunctionArgumentArrayRefTy(getArguments(),
- [](SILArgument *A) -> SILFunctionArgument* {
- return cast<SILFunctionArgument>(A);
+/// Declared out of line so we can have a declaration of SILArgument.
+FunctionArgumentArrayRef SILBasicBlock::getFunctionArguments() const {
+ return FunctionArgumentArrayRef(getArguments(), [](SILArgument *arg) {
+ return cast<SILFunctionArgument>(arg);
});
}
diff --git a/lib/SIL/SILInstructions.cpp b/lib/SIL/SILInstructions.cpp
index a9169af..e229692 100644
--- a/lib/SIL/SILInstructions.cpp
+++ b/lib/SIL/SILInstructions.cpp
@@ -1061,6 +1061,15 @@
llvm_unreachable("Unhandled TermKind in switch.");
}
+TermInst::SuccessorBlockArgumentsListTy
+TermInst::getSuccessorBlockArguments() const {
+ function_ref<PHIArgumentArrayRef(const SILSuccessor &)> op;
+ op = [](const SILSuccessor &succ) -> PHIArgumentArrayRef {
+ return succ.getBB()->getPHIArguments();
+ };
+ return SuccessorBlockArgumentsListTy(getSuccessors(), op);
+}
+
YieldInst *YieldInst::create(SILDebugLocation loc,
ArrayRef<SILValue> yieldedValues,
SILBasicBlock *normalBB, SILBasicBlock *unwindBB,
diff --git a/stdlib/public/SDK/Foundation/Measurement.swift b/stdlib/public/SDK/Foundation/Measurement.swift
index 320bf9e..72513aa 100644
--- a/stdlib/public/SDK/Foundation/Measurement.swift
+++ b/stdlib/public/SDK/Foundation/Measurement.swift
@@ -206,9 +206,15 @@
// Implementation note: similar to NSArray, NSDictionary, etc., NSMeasurement's import as an ObjC generic type is suppressed by the importer. Eventually we will need a more general purpose mechanism to correctly import generic types.
+// FIXME: Remove @usableFromInline from MeasurementBridgeType once
+// rdar://problem/44662501 is fixed. (The Radar basically just says "look
+// through typealiases and inherited protocols when printing extensions".)
+
#if DEPLOYMENT_RUNTIME_SWIFT
+@usableFromInline
internal typealias MeasurementBridgeType = _ObjectTypeBridgeable
#else
+@usableFromInline
internal typealias MeasurementBridgeType = _ObjectiveCBridgeable
#endif
diff --git a/stdlib/public/SwiftShims/HeapObject.h b/stdlib/public/SwiftShims/HeapObject.h
index cbc1309..97ccbc4 100644
--- a/stdlib/public/SwiftShims/HeapObject.h
+++ b/stdlib/public/SwiftShims/HeapObject.h
@@ -122,7 +122,7 @@
#define _swift_abi_ObjCReservedLowBits \
(unsigned) SWIFT_ABI_X86_64_OBJC_NUM_RESERVED_LOW_BITS
-#elif defined(__arm64__)
+#elif defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
#ifdef __APPLE__
#define _swift_abi_LeastValidPointerValue \
@@ -165,10 +165,10 @@
#define _swift_abi_LeastValidPointerValue \
(__swift_uintptr_t) SWIFT_ABI_DEFAULT_LEAST_VALID_POINTER
-#if __i386__
+#if defined(__i386__)
#define _swift_abi_SwiftSpareBitsMask \
(__swift_uintptr_t) SWIFT_ABI_I386_SWIFT_SPARE_BITS_MASK
-#elif __arm__
+#elif defined(__arm__) || defined(_M_ARM)
#define _swift_abi_SwiftSpareBitsMask \
(__swift_uintptr_t) SWIFT_ABI_ARM_SWIFT_SPARE_BITS_MASK
#else
diff --git a/stdlib/public/core/ThreadLocalStorage.swift b/stdlib/public/core/ThreadLocalStorage.swift
index ecd79d3..8bff3c8 100644
--- a/stdlib/public/core/ThreadLocalStorage.swift
+++ b/stdlib/public/core/ThreadLocalStorage.swift
@@ -38,6 +38,7 @@
//
// private
internal var uBreakIterator: OpaquePointer
+ internal var uText: OpaquePointer
// TODO: Consider saving two, e.g. for character-by-character comparison
@@ -55,8 +56,9 @@
// TODO: unowned reference to string owner, base address, and _countAndFlags
// private: Should only be called by _initializeThreadLocalStorage
- internal init(_uBreakIterator: OpaquePointer) {
+ internal init(_uBreakIterator: OpaquePointer, _uText: OpaquePointer) {
self.uBreakIterator = _uBreakIterator
+ self.uText = _uText
}
// Get the current thread's TLS pointer. On first call for a given thread,
@@ -104,19 +106,26 @@
internal func _createThreadLocalStorage()
-> UnsafeMutablePointer<_ThreadLocalStorage>
{
- // Create and initialize one.
+ // Allocate and initialize a UBreakIterator and UText.
var err = __swift_stdlib_U_ZERO_ERROR
let newUBreakIterator = __swift_stdlib_ubrk_open(
/*type:*/ __swift_stdlib_UBRK_CHARACTER, /*locale:*/ nil,
/*text:*/ nil, /*textLength:*/ 0, /*status:*/ &err)
_precondition(err.isSuccess, "Unexpected ubrk_open failure")
+ // utext_openUTF8 needs a valid pointer, even though we won't read from it
+ var a: Int8 = 0x41
+ let newUText = __swift_stdlib_utext_openUTF8(
+ /*ut:*/ nil, /*s:*/ &a, /*len:*/ 1, /*status:*/ &err)
+
+ _precondition(err.isSuccess, "Unexpected utext_openUTF8 failure")
+
let tlsPtr: UnsafeMutablePointer<_ThreadLocalStorage>
= UnsafeMutablePointer<_ThreadLocalStorage>.allocate(
capacity: 1
)
- tlsPtr.initialize(
- to: _ThreadLocalStorage(_uBreakIterator: newUBreakIterator)
- )
+ tlsPtr.initialize(to: _ThreadLocalStorage(
+ _uBreakIterator: newUBreakIterator, _uText: newUText))
+
return tlsPtr
}
diff --git a/stdlib/public/runtime/HeapObject.cpp b/stdlib/public/runtime/HeapObject.cpp
index 32a9246..557931e 100644
--- a/stdlib/public/runtime/HeapObject.cpp
+++ b/stdlib/public/runtime/HeapObject.cpp
@@ -61,7 +61,7 @@
/// Returns true if the pointer passed to a native retain or release is valid.
/// If false, the operation should immediately return.
static inline bool isValidPointerForNativeRetain(const void *p) {
-#if defined(__x86_64__) || defined(__arm64__)
+#if defined(__x86_64__) || defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
// On these platforms, the upper half of address space is reserved for the
// kernel, so we can assume that pointer values in this range are invalid.
return (intptr_t)p > 0;
diff --git a/stdlib/public/runtime/SwiftObject.mm b/stdlib/public/runtime/SwiftObject.mm
index f7137bd..f92812e 100644
--- a/stdlib/public/runtime/SwiftObject.mm
+++ b/stdlib/public/runtime/SwiftObject.mm
@@ -498,7 +498,7 @@
#if defined(__x86_64__)
static uintptr_t const objectPointerIsObjCBit = 0x4000000000000000ULL;
-#elif defined(__arm64__)
+#elif defined(__arm64__) || defined(__arch64__) || defined(_M_ARM64)
static uintptr_t const objectPointerIsObjCBit = 0x4000000000000000ULL;
#else
static uintptr_t const objectPointerIsObjCBit = 0x00000002U;
diff --git a/stdlib/public/runtime/WeakReference.h b/stdlib/public/runtime/WeakReference.h
index 34dd52e..a0f86e9 100644
--- a/stdlib/public/runtime/WeakReference.h
+++ b/stdlib/public/runtime/WeakReference.h
@@ -78,16 +78,16 @@
#if !SWIFT_OBJC_INTEROP
NativeMarkerMask = 0,
NativeMarkerValue = 0
-#elif __x86_64__
+#elif defined(__x86_64__)
NativeMarkerMask = SWIFT_ABI_X86_64_OBJC_WEAK_REFERENCE_MARKER_MASK,
NativeMarkerValue = SWIFT_ABI_X86_64_OBJC_WEAK_REFERENCE_MARKER_VALUE
-#elif __i386__
+#elif defined(__i386__)
NativeMarkerMask = SWIFT_ABI_I386_OBJC_WEAK_REFERENCE_MARKER_MASK,
NativeMarkerValue = SWIFT_ABI_I386_OBJC_WEAK_REFERENCE_MARKER_VALUE
-#elif __arm__
+#elif defined(__arm__) || defined(_M_ARM)
NativeMarkerMask = SWIFT_ABI_ARM_OBJC_WEAK_REFERENCE_MARKER_MASK,
NativeMarkerValue = SWIFT_ABI_ARM_OBJC_WEAK_REFERENCE_MARKER_VALUE
-#elif __arm64__
+#elif defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
NativeMarkerMask = SWIFT_ABI_ARM64_OBJC_WEAK_REFERENCE_MARKER_MASK,
NativeMarkerValue = SWIFT_ABI_ARM64_OBJC_WEAK_REFERENCE_MARKER_VALUE
#else
diff --git a/stdlib/public/stubs/MathStubs.cpp b/stdlib/public/stubs/MathStubs.cpp
index 39ac393..dbafab6 100644
--- a/stdlib/public/stubs/MathStubs.cpp
+++ b/stdlib/public/stubs/MathStubs.cpp
@@ -64,7 +64,7 @@
(defined(__linux__) && defined(__aarch64__)) || \
(defined(__linux__) && defined(__powerpc64__)) || \
(defined(__linux__) && defined(__s390x__)) || \
- (defined(__ANDROID__) && defined(__arm64__))
+ (defined(__ANDROID__) && defined(__aarch64__))
SWIFT_RUNTIME_STDLIB_API
ti_int
diff --git a/test/Parse/multiline_errors.swift b/test/Parse/multiline_errors.swift
index 4fa56d0..de5c3cd 100644
--- a/test/Parse/multiline_errors.swift
+++ b/test/Parse/multiline_errors.swift
Binary files differ
diff --git a/test/Parse/string_literal_eof4.swift b/test/Parse/string_literal_eof4.swift
new file mode 100644
index 0000000..2f8f451
--- /dev/null
+++ b/test/Parse/string_literal_eof4.swift
@@ -0,0 +1,6 @@
+// RUN: %target-typecheck-verify-swift
+
+// NOTE: DO NOT add a newline at EOF.
+// expected-error@+1 {{unterminated string literal}}
+_ = """
+ foo
\ No newline at end of file
diff --git a/test/Parse/string_literal_eof5.swift b/test/Parse/string_literal_eof5.swift
new file mode 100644
index 0000000..04c359a
--- /dev/null
+++ b/test/Parse/string_literal_eof5.swift
@@ -0,0 +1,7 @@
+// RUN: %target-typecheck-verify-swift
+
+// NOTE: DO NOT add a newline at EOF.
+// expected-error@+1 {{unterminated string literal}}
+_ = """
+ foo
+ \(
diff --git a/test/Parse/string_literal_eof6.swift b/test/Parse/string_literal_eof6.swift
new file mode 100644
index 0000000..43611f4
--- /dev/null
+++ b/test/Parse/string_literal_eof6.swift
@@ -0,0 +1,7 @@
+// RUN: %target-typecheck-verify-swift
+
+// NOTE: DO NOT add a newline at EOF.
+// expected-error@+1 {{unterminated string literal}}
+_ = """
+ foo
+ \("bar
\ No newline at end of file
diff --git a/test/Parse/string_literal_eof7.swift b/test/Parse/string_literal_eof7.swift
new file mode 100644
index 0000000..8525270
--- /dev/null
+++ b/test/Parse/string_literal_eof7.swift
@@ -0,0 +1,9 @@
+// RUN: %target-typecheck-verify-swift
+
+// expected-error@+4 {{unterminated string literal}}
+// expected-error@+1 {{unterminated string literal}}
+_ = """
+ foo
+ \("bar
+ baz
+
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/line-col-conversion.swift b/test/SourceKit/Refactoring/semantic-refactoring/line-col-conversion.swift
new file mode 100644
index 0000000..02aca45
--- /dev/null
+++ b/test/SourceKit/Refactoring/semantic-refactoring/line-col-conversion.swift
@@ -0,0 +1,4 @@
+// RUN: %sourcekitd-test -req=local-rename -pos=4:7 -name new_name %s -- %s
+
+var Foo: Int {
+ var missingNewlineAtEndOfFile
\ No newline at end of file
diff --git a/test/api-digester/Inputs/cake.swift b/test/api-digester/Inputs/cake.swift
index ea09c0a..ed19110 100644
--- a/test/api-digester/Inputs/cake.swift
+++ b/test/api-digester/Inputs/cake.swift
@@ -49,4 +49,14 @@
var c = 3
}
-extension Int: P1 { public func bar() {} }
\ No newline at end of file
+extension Int: P1 { public func bar() {} }
+
+public protocol ProWithAssociatedType {
+ associatedtype A
+ associatedtype B = Int
+}
+
+public protocol SubsContainer {
+ subscript(getter i: Int) -> Int { get }
+ subscript(setter i: Int) -> Int { get set }
+}
diff --git a/test/api-digester/Inputs/cake1.swift b/test/api-digester/Inputs/cake1.swift
index 9483f7b..b97041c 100644
--- a/test/api-digester/Inputs/cake1.swift
+++ b/test/api-digester/Inputs/cake1.swift
@@ -69,3 +69,17 @@
public protocol P3: P2, P1 {}
extension fixedLayoutStruct: P1 {}
+
+public protocol AssociatedTypePro {
+ associatedtype T1 = Int
+ associatedtype T2
+ associatedtype T3 = C1
+}
+
+public class RemoveSetters {
+ public var Value = 4
+ public subscript(_ idx: Int) -> Int {
+ get { return 1 }
+ set(newValue) {}
+ }
+}
diff --git a/test/api-digester/Inputs/cake2.swift b/test/api-digester/Inputs/cake2.swift
index a410da4..608ac31 100644
--- a/test/api-digester/Inputs/cake2.swift
+++ b/test/api-digester/Inputs/cake2.swift
@@ -76,3 +76,17 @@
public protocol P4 {}
extension fixedLayoutStruct: P2 {}
+
+public protocol AssociatedTypePro {
+ associatedtype T1
+ associatedtype T2
+ associatedtype T3 = C6
+}
+
+public class RemoveSetters {
+ public private(set) var Value = 4
+ public subscript(_ idx: Int) -> Int {
+ get { return 1 }
+ }
+}
+
diff --git a/test/api-digester/Outputs/Cake-abi.txt b/test/api-digester/Outputs/Cake-abi.txt
index 137ad54..6d21e40 100644
--- a/test/api-digester/Outputs/Cake-abi.txt
+++ b/test/api-digester/Outputs/Cake-abi.txt
@@ -9,6 +9,8 @@
cake1: Constructor Somestruct2.init(_:) has been removed
cake1: Constructor fixedLayoutStruct.init(b:a:) has been removed
cake1: Func C4.foo() has been removed
+cake1: Subscript RemoveSetters.subscript(_:) has removed its setter
+cake1: Var RemoveSetters.Value has removed its setter
/* Moved Decls */
@@ -17,6 +19,7 @@
cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
/* Type Changes */
+cake1: AssociatedType AssociatedTypePro.T3 has default type change from C1 to C6
cake1: Constructor S1.init(_:) has parameter 0 type change from Int to Double
cake1: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
cake1: Func C7.foo(_:_:) has removed default argument from parameter 0
@@ -47,3 +50,6 @@
cake1: Protocol P3 has added inherited protocol P4
cake1: Protocol P3 has removed inherited protocol P2
cake1: Struct fixedLayoutStruct has removed conformance to P1
+
+/* Protocol Requirement Change */
+cake1: AssociatedType AssociatedTypePro.T1 has removed default type Int
diff --git a/test/api-digester/Outputs/Cake.txt b/test/api-digester/Outputs/Cake.txt
index 70b4e29..60b7268 100644
--- a/test/api-digester/Outputs/Cake.txt
+++ b/test/api-digester/Outputs/Cake.txt
@@ -9,6 +9,8 @@
cake1: Constructor Somestruct2.init(_:) has been removed
cake1: Constructor fixedLayoutStruct.init(b:a:) has been removed
cake1: Func C4.foo() has been removed
+cake1: Subscript RemoveSetters.subscript(_:) has removed its setter
+cake1: Var RemoveSetters.Value has removed its setter
/* Moved Decls */
@@ -17,6 +19,7 @@
cake1: Struct Somestruct2 has been renamed to Struct NSSomestruct2
/* Type Changes */
+cake1: AssociatedType AssociatedTypePro.T3 has default type change from C1 to C6
cake1: Constructor S1.init(_:) has parameter 0 type change from Int to Double
cake1: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
cake1: Func C7.foo(_:_:) has removed default argument from parameter 0
@@ -33,3 +36,6 @@
cake1: Protocol P3 has added inherited protocol P4
cake1: Protocol P3 has removed inherited protocol P2
cake1: Struct fixedLayoutStruct has removed conformance to P1
+
+/* Protocol Requirement Change */
+cake1: AssociatedType AssociatedTypePro.T1 has removed default type Int
diff --git a/test/api-digester/Outputs/cake-abi.json b/test/api-digester/Outputs/cake-abi.json
index 93d20c3..10b542a 100644
--- a/test/api-digester/Outputs/cake-abi.json
+++ b/test/api-digester/Outputs/cake-abi.json
@@ -808,33 +808,6 @@
"usr": "s:Si"
}
]
- },
- {
- "kind": "Setter",
- "name": "_",
- "printedName": "_()",
- "declKind": "Accessor",
- "usr": "s:4cake17fixedLayoutStructV1b33_3D8926C30F7417F2EF9A277D0C73FBDBLLSivs",
- "location": "",
- "moduleName": "cake",
- "implicit": true,
- "mutating": true,
- "declAttributes": [
- "Transparent"
- ],
- "children": [
- {
- "kind": "TypeNominal",
- "name": "Void",
- "printedName": "()"
- },
- {
- "kind": "TypeNominal",
- "name": "Int",
- "printedName": "Int",
- "usr": "s:Si"
- }
- ]
}
]
},
@@ -877,33 +850,6 @@
"usr": "s:Si"
}
]
- },
- {
- "kind": "Setter",
- "name": "_",
- "printedName": "_()",
- "declKind": "Accessor",
- "usr": "s:4cake17fixedLayoutStructV1cSivs",
- "location": "",
- "moduleName": "cake",
- "implicit": true,
- "mutating": true,
- "declAttributes": [
- "Transparent"
- ],
- "children": [
- {
- "kind": "TypeNominal",
- "name": "Void",
- "printedName": "()"
- },
- {
- "kind": "TypeNominal",
- "name": "Int",
- "printedName": "Int",
- "usr": "s:Si"
- }
- ]
}
]
},
@@ -965,6 +911,103 @@
},
{
"kind": "TypeDecl",
+ "name": "ProWithAssociatedType",
+ "printedName": "ProWithAssociatedType",
+ "declKind": "Protocol",
+ "usr": "s:4cake21ProWithAssociatedTypeP",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "AssociatedType",
+ "name": "A",
+ "printedName": "A",
+ "declKind": "AssociatedType",
+ "usr": "s:4cake21ProWithAssociatedTypeP1AQa",
+ "location": "",
+ "moduleName": "cake"
+ },
+ {
+ "kind": "AssociatedType",
+ "name": "B",
+ "printedName": "B",
+ "declKind": "AssociatedType",
+ "usr": "s:4cake21ProWithAssociatedTypeP1BQa",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "kind": "TypeDecl",
+ "name": "SubsContainer",
+ "printedName": "SubsContainer",
+ "declKind": "Protocol",
+ "usr": "s:4cake13SubsContainerP",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "Subscript",
+ "name": "subscript",
+ "printedName": "subscript(getter:)",
+ "declKind": "Subscript",
+ "usr": "s:4cake13SubsContainerP6getterS2i_tcip",
+ "location": "",
+ "moduleName": "cake",
+ "genericSig": "<τ_0_0 where τ_0_0 : SubsContainer>",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ },
+ {
+ "kind": "Subscript",
+ "name": "subscript",
+ "printedName": "subscript(setter:)",
+ "declKind": "Subscript",
+ "usr": "s:4cake13SubsContainerP6setterS2i_tcip",
+ "location": "",
+ "moduleName": "cake",
+ "genericSig": "<τ_0_0 where τ_0_0 : SubsContainer>",
+ "hasSetter": true,
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "kind": "TypeDecl",
"name": "Int",
"printedName": "Int",
"declKind": "Struct",
diff --git a/test/api-digester/Outputs/cake.json b/test/api-digester/Outputs/cake.json
index cf77bae..c35c9fb 100644
--- a/test/api-digester/Outputs/cake.json
+++ b/test/api-digester/Outputs/cake.json
@@ -841,6 +841,103 @@
},
{
"kind": "TypeDecl",
+ "name": "ProWithAssociatedType",
+ "printedName": "ProWithAssociatedType",
+ "declKind": "Protocol",
+ "usr": "s:4cake21ProWithAssociatedTypeP",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "AssociatedType",
+ "name": "A",
+ "printedName": "A",
+ "declKind": "AssociatedType",
+ "usr": "s:4cake21ProWithAssociatedTypeP1AQa",
+ "location": "",
+ "moduleName": "cake"
+ },
+ {
+ "kind": "AssociatedType",
+ "name": "B",
+ "printedName": "B",
+ "declKind": "AssociatedType",
+ "usr": "s:4cake21ProWithAssociatedTypeP1BQa",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "kind": "TypeDecl",
+ "name": "SubsContainer",
+ "printedName": "SubsContainer",
+ "declKind": "Protocol",
+ "usr": "s:4cake13SubsContainerP",
+ "location": "",
+ "moduleName": "cake",
+ "children": [
+ {
+ "kind": "Subscript",
+ "name": "subscript",
+ "printedName": "subscript(getter:)",
+ "declKind": "Subscript",
+ "usr": "s:4cake13SubsContainerP6getterS2i_tcip",
+ "location": "",
+ "moduleName": "cake",
+ "genericSig": "<Self where Self : SubsContainer>",
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ },
+ {
+ "kind": "Subscript",
+ "name": "subscript",
+ "printedName": "subscript(setter:)",
+ "declKind": "Subscript",
+ "usr": "s:4cake13SubsContainerP6setterS2i_tcip",
+ "location": "",
+ "moduleName": "cake",
+ "genericSig": "<Self where Self : SubsContainer>",
+ "hasSetter": true,
+ "children": [
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ },
+ {
+ "kind": "TypeNominal",
+ "name": "Int",
+ "printedName": "Int",
+ "usr": "s:Si"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "kind": "TypeDecl",
"name": "Int",
"printedName": "Int",
"declKind": "Struct",
diff --git a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
index 75275e4..17175f1 100644
--- a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
+++ b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
@@ -1963,11 +1963,10 @@
const char *Ptr = InputBuf->getBufferStart();
const char *End = InputBuf->getBufferEnd();
const char *LineStart = Ptr;
- for (; Ptr < End; ++Ptr) {
+ --Line;
+ for (; Line && (Ptr < End); ++Ptr) {
if (*Ptr == '\n') {
--Line;
- if (Line == 0)
- break;
LineStart = Ptr+1;
}
}
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
index d4f9a4d..a1e7a79 100644
--- a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
+++ b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
@@ -58,6 +58,7 @@
StringRef EnumRawTypeName;
TypeInitInfo TypeInfo;
StringRef GenericSig;
+ bool HasSetter = false;
SDKNodeInitInfo(SDKContext &Ctx) : Ctx(Ctx) {}
SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD);
@@ -130,12 +131,35 @@
SDKNodeDeclSetter::SDKNodeDeclSetter(SDKNodeInitInfo Info):
SDKNodeDeclAbstractFunc(Info, SDKNodeKind::DeclSetter) {}
+SDKNodeDeclAssociatedType::SDKNodeDeclAssociatedType(SDKNodeInitInfo Info):
+ SDKNodeDecl(Info, SDKNodeKind::DeclAssociatedType) {};
+
+SDKNodeDeclSubscript::SDKNodeDeclSubscript(SDKNodeInitInfo Info):
+ SDKNodeDeclAbstractFunc(Info, SDKNodeKind::DeclSubscript),
+ HasSetter(Info.HasSetter) {}
+
StringRef SDKNodeDecl::getHeaderName() const {
if (Location.empty())
return StringRef();
return llvm::sys::path::filename(Location.split(":").first);
}
+SDKNodeDeclGetter *SDKNodeDeclVar::getGetter() const {
+ if (getChildrenCount() > 1)
+ return cast<SDKNodeDeclGetter>(childAt(1));
+ return nullptr;
+}
+
+SDKNodeDeclSetter *SDKNodeDeclVar::getSetter() const {
+ if (getChildrenCount() > 2)
+ return cast<SDKNodeDeclSetter>(childAt(2));
+ return nullptr;
+}
+
+SDKNodeType *SDKNodeDeclVar::getType() const {
+ return cast<SDKNodeType>(childAt(0));
+}
+
NodePtr UpdatedNodesMap::findUpdateCounterpart(const SDKNode *Node) const {
assert(Node->isAnnotatedAs(NodeAnnotation::Updated) && "Not update operation.");
auto FoundPair = std::find_if(MapImpl.begin(), MapImpl.end(),
@@ -348,6 +372,8 @@
case SDKNodeKind::DeclTypeAlias:
case SDKNodeKind::DeclType:
case SDKNodeKind::DeclVar:
+ case SDKNodeKind::DeclAssociatedType:
+ case SDKNodeKind::DeclSubscript:
return true;
case SDKNodeKind::Root:
case SDKNodeKind::TypeNominal:
@@ -435,6 +461,7 @@
case SDKNodeKind::DeclSetter:
case SDKNodeKind::DeclGetter:
case SDKNodeKind::DeclConstructor:
+ case SDKNodeKind::DeclSubscript:
return true;
default:
@@ -567,6 +594,9 @@
case KeyKind::KK_implicit:
Info.IsImplicit = true;
break;
+ case KeyKind::KK_hasSetter:
+ Info.HasSetter = true;
+ break;
case KeyKind::KK_ownership:
Info.ReferenceOwnership =
swift::ReferenceOwnership(getAsInt(Pair.getValue()));
@@ -731,6 +761,14 @@
}
LLVM_FALLTHROUGH;
}
+ case SDKNodeKind::DeclAssociatedType:
+ case SDKNodeKind::DeclSubscript: {
+ auto *Left = dyn_cast<SDKNodeDeclSubscript>(this);
+ auto *Right = dyn_cast<SDKNodeDeclSubscript>(&Other);
+ if (Left && Right && Left->hasSetter() != Right->hasSetter())
+ return false;
+ LLVM_FALLTHROUGH;
+ }
case SDKNodeKind::DeclTypeAlias: {
auto Left = this->getAs<SDKNodeDecl>();
auto Right = (&Other)->getAs<SDKNodeDecl>();
@@ -863,9 +901,8 @@
static StringRef getPrintedName(SDKContext &Ctx, ValueDecl *VD) {
llvm::SmallString<32> Result;
- if (auto FD = dyn_cast<AbstractFunctionDecl>(VD)) {
- auto DM = FD->getFullName();
-
+ DeclName DM = VD->getFullName();
+ if (isa<AbstractFunctionDecl>(VD) || isa<SubscriptDecl>(VD)) {
if (DM.getBaseName().empty()) {
Result.append("_");
} else {
@@ -880,7 +917,6 @@
Result.append(")");
return Ctx.buffer(Result.str());
}
- auto DM = VD->getFullName();
Result.append(getEscapedName(DM.getBaseName()));
return Ctx.buffer(Result.str());
}
@@ -1047,6 +1083,11 @@
}
}
}
+
+ // Record whether a subscript has getter/setter.
+ if (auto *SD = dyn_cast<SubscriptDecl>(VD)) {
+ HasSetter = SD->getSetter();
+ }
}
SDKNode *SDKNodeInitInfo::createSDKNode(SDKNodeKind Kind) {
@@ -1238,8 +1279,10 @@
if (auto VAD = dyn_cast<AbstractStorageDecl>(VD)) {
if (auto Getter = VAD->getGetter())
Var->addChild(constructFunctionNode(Ctx, Getter, SDKNodeKind::DeclGetter));
- if (auto Setter = VAD->getSetter())
- Var->addChild(constructFunctionNode(Ctx, Setter, SDKNodeKind::DeclSetter));
+ if (auto Setter = VAD->getSetter()) {
+ if (Setter->getFormalAccess() > AccessLevel::Internal)
+ Var->addChild(constructFunctionNode(Ctx, Setter, SDKNodeKind::DeclSetter));
+ }
}
return Var;
}
@@ -1250,6 +1293,24 @@
return Alias;
}
+static SDKNode *constructAssociatedTypeNode(SDKContext &Ctx,
+ AssociatedTypeDecl *ATD) {
+ auto Asso = SDKNodeInitInfo(Ctx, ATD).
+ createSDKNode(SDKNodeKind::DeclAssociatedType);
+ if (auto DT = ATD->getDefaultDefinitionType()) {
+ Asso->addChild(constructTypeNode(Ctx, DT));
+ }
+ return Asso;
+}
+
+static SDKNode *constructSubscriptDeclNode(SDKContext &Ctx, SubscriptDecl *SD) {
+ auto Subs = SDKNodeInitInfo(Ctx, SD).createSDKNode(SDKNodeKind::DeclSubscript);
+ Subs->addChild(constructTypeNode(Ctx, SD->getElementInterfaceType()));
+ for (auto *Node: createParameterNodes(Ctx, SD->getIndices()))
+ Subs->addChild(Node);
+ return Subs;
+}
+
static void addMembersToRoot(SDKContext &Ctx, SDKNode *Root,
IterableDeclContext *Context,
std::set<ExtensionDecl*> &HandledExts) {
@@ -1268,6 +1329,16 @@
Root->addChild(constructVarNode(Ctx, EED));
} else if (auto NTD = dyn_cast<NominalTypeDecl>(Member)) {
Root->addChild(constructTypeDeclNode(Ctx, NTD, HandledExts));
+ } else if (auto ATD = dyn_cast<AssociatedTypeDecl>(Member)) {
+ Root->addChild(constructAssociatedTypeNode(Ctx, ATD));
+ } else if (auto SD = dyn_cast<SubscriptDecl>(Member)) {
+ Root->addChild(constructSubscriptDeclNode(Ctx, SD));
+ } else if (isa<PatternBindingDecl>(Member)) {
+ // All containing variables should have been handled.
+ } else if (isa<DestructorDecl>(Member)) {
+ // deinit has no impact.
+ } else {
+ llvm_unreachable("unhandled member decl kind.");
}
}
}
@@ -1427,6 +1498,12 @@
out.mapRequired(getKeyContent(Ctx, KeyKind::KK_selfIndex).data(),
Index);
}
+ if (auto S = dyn_cast<SDKNodeDeclSubscript>(value)) {
+ if (bool hasSetter = S->hasSetter()) {
+ out.mapRequired(getKeyContent(Ctx, KeyKind::KK_hasSetter).data(),
+ hasSetter);
+ }
+ }
}
if (auto *TD = dyn_cast<SDKNodeDeclType>(value)) {
auto Super = TD->getSuperClassUsr();
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.h b/tools/swift-api-digester/ModuleAnalyzerNodes.h
index 8835863..fb4e38d 100644
--- a/tools/swift-api-digester/ModuleAnalyzerNodes.h
+++ b/tools/swift-api-digester/ModuleAnalyzerNodes.h
@@ -207,7 +207,8 @@
};
class SDKNodeRoot;
-
+class SDKNodeDeclGetter;
+class SDKNodeDeclSetter;
struct SDKNodeInitInfo;
class SDKNode {
@@ -440,6 +441,15 @@
static bool classof(const SDKNode *N);
};
+class SDKNodeDeclAssociatedType: public SDKNodeDecl {
+public:
+ SDKNodeDeclAssociatedType(SDKNodeInitInfo Info);
+ const SDKNodeType* getDefault() const {
+ return getChildrenCount() ? getOnlyChild()->getAs<SDKNodeType>(): nullptr;
+ }
+ static bool classof(const SDKNode *N);
+};
+
class SDKNodeDeclVar : public SDKNodeDecl {
Optional<unsigned> FixedBinaryOrder;
public:
@@ -447,6 +457,9 @@
static bool classof(const SDKNode *N);
bool hasFixedBinaryOrder() const { return FixedBinaryOrder.hasValue(); }
unsigned getFixedBinaryOrder() const { return *FixedBinaryOrder; }
+ SDKNodeDeclGetter *getGetter() const;
+ SDKNodeDeclSetter *getSetter() const;
+ SDKNodeType *getType() const;
};
class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
@@ -466,6 +479,14 @@
static StringRef getTypeRoleDescription(SDKContext &Ctx, unsigned Index);
};
+class SDKNodeDeclSubscript: public SDKNodeDeclAbstractFunc {
+ bool HasSetter;
+public:
+ SDKNodeDeclSubscript(SDKNodeInitInfo Info);
+ static bool classof(const SDKNode *N);
+ bool hasSetter() const { return HasSetter; }
+};
+
class SDKNodeDeclFunction: public SDKNodeDeclAbstractFunc {
public:
SDKNodeDeclFunction(SDKNodeInitInfo Info);
diff --git a/tools/swift-api-digester/ModuleDiagsConsumer.cpp b/tools/swift-api-digester/ModuleDiagsConsumer.cpp
index cfc21aa..f570302 100644
--- a/tools/swift-api-digester/ModuleDiagsConsumer.cpp
+++ b/tools/swift-api-digester/ModuleDiagsConsumer.cpp
@@ -33,6 +33,7 @@
static StringRef getCategoryName(uint32_t ID) {
switch(ID) {
case LocalDiagID::removed_decl:
+ case LocalDiagID::removed_setter:
return "/* Removed Decls */";
case LocalDiagID::moved_decl:
return "/* Moved Decls */";
@@ -54,6 +55,8 @@
case LocalDiagID::conformance_added:
case LocalDiagID::conformance_removed:
return "/* Protocol Conformance Change */";
+ case LocalDiagID::default_associated_type_removed:
+ return "/* Protocol Requirement Change */";
default:
return StringRef();
}
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
index 5cb4c3a..060aef5 100644
--- a/tools/swift-api-digester/swift-api-digester.cpp
+++ b/tools/swift-api-digester/swift-api-digester.cpp
@@ -817,6 +817,13 @@
case NodeMatchReason::Removed:
assert(!Right);
Left->annotate(NodeAnnotation::Removed);
+ if (auto *LT = dyn_cast<SDKNodeType>(Left)) {
+ if (auto *AT = dyn_cast<SDKNodeDeclAssociatedType>(LT->getParent())) {
+ Ctx.getDiags().diagnose(SourceLoc(),
+ diag::default_associated_type_removed,
+ AT->getScreenInfo(), LT->getPrintedName());
+ }
+ }
return;
case NodeMatchReason::FuncToProperty:
case NodeMatchReason::ModernizeEnum:
@@ -860,6 +867,17 @@
break;
}
+ case SDKNodeKind::DeclSubscript: {
+ if (auto *LS = dyn_cast<SDKNodeDeclSubscript>(Left)) {
+ auto *RS = cast<SDKNodeDeclSubscript>(Right);
+ if (LS->hasSetter() && !RS->hasSetter()) {
+ Ctx.getDiags().diagnose(SourceLoc(), diag::removed_setter,
+ LS->getScreenInfo());
+ }
+ }
+ LLVM_FALLTHROUGH;
+ }
+ case SDKNodeKind::DeclAssociatedType:
case SDKNodeKind::DeclFunction:
case SDKNodeKind::DeclSetter:
case SDKNodeKind::DeclGetter:
@@ -877,10 +895,16 @@
}
case SDKNodeKind::DeclVar: {
- auto LC = Left->getChildren()[0];
- auto RC = Right->getChildren()[0];
+ auto LVar = cast<SDKNodeDeclVar>(Left);
+ auto RVar = cast<SDKNodeDeclVar>(Right);
+ auto LC = LVar->getType();
+ auto RC = RVar->getType();
if (!(*LC == *RC))
foundMatch(LC, RC, NodeMatchReason::Sequential);
+ if (LVar->getSetter() && !RVar->getSetter()) {
+ Ctx.getDiags().diagnose(SourceLoc(), diag::removed_setter,
+ LVar->getScreenInfo());
+ }
break;
}
}
@@ -1732,6 +1756,10 @@
Diags.diagnose(SourceLoc(), diag::decl_type_change, Parent->getScreenInfo(),
Descriptor, Node->getPrintedName(), Count->getPrintedName());
break;
+ case SDKNodeKind::DeclAssociatedType:
+ Diags.diagnose(SourceLoc(), diag::decl_type_change, Parent->getScreenInfo(),
+ "default", Node->getPrintedName(), Count->getPrintedName());
+ break;
default:
break;
}
