Skip to content

Commit 9ccee7d

Browse files
swift-ciswift-ci
committed
---
yaml --- r: 229375 b: refs/heads/master-next c: bf466fe h: refs/heads/master i: 229373: 1f070e7 229371: 3ed4984 229367: 698baa1 229359: b8cedc9 229343: 33f7c20 229311: fb0b7d8 229247: cc77415 229119: 3e50aff 228863: a29830a 228351: 03e453f 227327: 5ce6202 225279: 2164497 221183: dfb6c16 212991: 1aeddf8 196607: 28f4fa7
1 parent 6f367ae commit 9ccee7d

File tree

9 files changed

+27
-18
lines changed

9 files changed

+27
-18
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: a37c1f05e28110b00b679c219d162d85a7e2b546
3-
refs/heads/master-next: ca4898fbbf83bca9dcc3617e050f105433dbb174
3+
refs/heads/master-next: bf466fe1db85518ba3b29ec1f980119d268a9c65
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/lib/AST/ASTPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
436436
bool Invalid;
437437
unsigned StartLocCol =
438438
ClangContext.getSourceManager().getSpellingColumnNumber(
439-
RC->getLocStart(), &Invalid);
439+
RC->getBeginLoc(), &Invalid);
440440
if (Invalid)
441441
StartLocCol = 0;
442442

‎branches/master-next/lib/Basic/Platform.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
138138
case llvm::Triple::Mesa3D:
139139
case llvm::Triple::Contiki:
140140
case llvm::Triple::AMDPAL:
141+
case llvm::Triple::HermitCore:
141142
return "";
142143
case llvm::Triple::Darwin:
143144
case llvm::Triple::MacOSX:

‎branches/master-next/lib/ClangImporter/ImportDecl.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,7 +2361,7 @@ namespace {
23612361
TypeAliasDecl *typealias = nullptr;
23622362
typealias = Impl.createDeclWithClangNode<TypeAliasDecl>(
23632363
Decl, AccessLevel::Public,
2364-
Impl.importSourceLoc(Decl->getLocStart()),
2364+
Impl.importSourceLoc(Decl->getBeginLoc()),
23652365
SourceLoc(), Name,
23662366
Impl.importSourceLoc(Decl->getLocation()),
23672367
/*genericparams*/nullptr, DC);
@@ -2380,7 +2380,7 @@ namespace {
23802380
TypeAliasDecl *typealias = nullptr;
23812381
typealias = Impl.createDeclWithClangNode<TypeAliasDecl>(
23822382
Decl, AccessLevel::Public,
2383-
Impl.importSourceLoc(Decl->getLocStart()),
2383+
Impl.importSourceLoc(Decl->getBeginLoc()),
23842384
SourceLoc(), Name,
23852385
Impl.importSourceLoc(Decl->getLocation()),
23862386
/*genericparams*/nullptr, DC);
@@ -2448,7 +2448,7 @@ namespace {
24482448
auto Loc = Impl.importSourceLoc(Decl->getLocation());
24492449
auto Result = Impl.createDeclWithClangNode<TypeAliasDecl>(Decl,
24502450
AccessLevel::Public,
2451-
Impl.importSourceLoc(Decl->getLocStart()),
2451+
Impl.importSourceLoc(Decl->getBeginLoc()),
24522452
SourceLoc(), Name,
24532453
Loc,
24542454
/*genericparams*/nullptr, DC);
@@ -2589,7 +2589,7 @@ namespace {
25892589
/// Basic information about the enum type we're building.
25902590
Identifier enumName = name;
25912591
DeclContext *enumDC = dc;
2592-
SourceLoc loc = Impl.importSourceLoc(decl->getLocStart());
2592+
SourceLoc loc = Impl.importSourceLoc(decl->getBeginLoc());
25932593

25942594
// If this is an error enum, form the error wrapper type,
25952595
// which is a struct containing an NSError instance.
@@ -3041,7 +3041,7 @@ namespace {
30413041
auto name = importedName.getDeclName().getBaseIdentifier();
30423042
auto result = Impl.createDeclWithClangNode<StructDecl>(decl,
30433043
AccessLevel::Public,
3044-
Impl.importSourceLoc(decl->getLocStart()),
3044+
Impl.importSourceLoc(decl->getBeginLoc()),
30453045
name,
30463046
Impl.importSourceLoc(decl->getLocation()),
30473047
None, nullptr, dc);
@@ -3365,7 +3365,7 @@ namespace {
33653365
/*IsStatic*/false,
33663366
VarDecl::Specifier::Var,
33673367
/*IsCaptureList*/false,
3368-
Impl.importSourceLoc(decl->getLocStart()),
3368+
Impl.importSourceLoc(decl->getBeginLoc()),
33693369
name, dc);
33703370
result->setInterfaceType(type);
33713371
result->setIsObjC(false);
@@ -4248,7 +4248,7 @@ namespace {
42484248
if (!dc)
42494249
return nullptr;
42504250

4251-
auto loc = Impl.importSourceLoc(decl->getLocStart());
4251+
auto loc = Impl.importSourceLoc(decl->getBeginLoc());
42524252
auto result = ExtensionDecl::create(
42534253
Impl.SwiftContext, loc,
42544254
TypeLoc::withoutLoc(objcClass->getDeclaredType()),
@@ -4411,7 +4411,7 @@ namespace {
44114411
// Create the protocol declaration and record it.
44124412
auto result = Impl.createDeclWithClangNode<ProtocolDecl>(
44134413
decl, AccessLevel::Public, dc,
4414-
Impl.importSourceLoc(decl->getLocStart()),
4414+
Impl.importSourceLoc(decl->getBeginLoc()),
44154415
Impl.importSourceLoc(decl->getLocation()), name, None,
44164416
/*TrailingWhere=*/nullptr);
44174417
result->computeType();
@@ -4563,7 +4563,7 @@ namespace {
45634563

45644564
// Create the class declaration and record it.
45654565
auto result = Impl.createDeclWithClangNode<ClassDecl>(
4566-
decl, access, Impl.importSourceLoc(decl->getLocStart()), name,
4566+
decl, access, Impl.importSourceLoc(decl->getBeginLoc()), name,
45674567
Impl.importSourceLoc(decl->getLocation()), None, nullptr, dc);
45684568

45694569
// Import generic arguments, if any.
@@ -4888,7 +4888,7 @@ namespace {
48884888
TypeAliasDecl *typealias = nullptr;
48894889
typealias = Impl.createDeclWithClangNode<TypeAliasDecl>(
48904890
decl, AccessLevel::Public,
4891-
Impl.importSourceLoc(decl->getLocStart()),
4891+
Impl.importSourceLoc(decl->getBeginLoc()),
48924892
SourceLoc(), name,
48934893
Impl.importSourceLoc(decl->getLocation()),
48944894
/*genericparams=*/nullptr, dc);
@@ -5121,7 +5121,7 @@ Decl *SwiftDeclConverter::importCompatibilityTypeAlias(
51215121

51225122
// Create the type alias.
51235123
auto alias = Impl.createDeclWithClangNode<TypeAliasDecl>(
5124-
decl, AccessLevel::Public, Impl.importSourceLoc(decl->getLocStart()),
5124+
decl, AccessLevel::Public, Impl.importSourceLoc(decl->getBeginLoc()),
51255125
SourceLoc(), compatibilityName.getDeclName().getBaseIdentifier(),
51265126
Impl.importSourceLoc(decl->getLocation()), /*generic params*/nullptr, dc);
51275127

‎branches/master-next/lib/ClangImporter/ImportEnumInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void EnumInfo::classifyEnum(const clang::EnumDecl *decl,
133133
// FIXME: Stop using these once flag_enum and enum_extensibility
134134
// have been adopted everywhere, or at least relegate them to Swift 4 mode
135135
// only.
136-
auto loc = decl->getLocStart();
136+
auto loc = decl->getBeginLoc();
137137
if (loc.isMacroID()) {
138138
StringRef MacroName = pp.getImmediateMacroName(loc);
139139
if (MacroName == "CF_ENUM" || MacroName == "__CF_NAMED_ENUM" ||

‎branches/master-next/lib/IRGen/IRGenDebugInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
10841084
auto *Decl = StructTy->getDecl();
10851085
auto L = getDebugLoc(*this, Decl);
10861086
if (auto *ClangDecl = Decl->getClangDecl()) {
1087-
auto ClangSrcLoc = ClangDecl->getLocStart();
1087+
auto ClangSrcLoc = ClangDecl->getBeginLoc();
10881088
clang::SourceManager &ClangSM =
10891089
CI.getClangASTContext().getSourceManager();
10901090
L.Line = ClangSM.getPresumedLineNumber(ClangSrcLoc);
@@ -1109,7 +1109,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
11091109
auto *Decl = ClassTy->getDecl();
11101110
auto L = getDebugLoc(*this, Decl);
11111111
if (auto *ClangDecl = Decl->getClangDecl()) {
1112-
auto ClangSrcLoc = ClangDecl->getLocStart();
1112+
auto ClangSrcLoc = ClangDecl->getBeginLoc();
11131113
clang::SourceManager &ClangSM =
11141114
CI.getClangASTContext().getSourceManager();
11151115
L.Line = ClangSM.getPresumedLineNumber(ClangSrcLoc);

‎branches/master-next/lib/SwiftDemangle/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ add_swift_library(swiftDemangle
77
C_COMPILE_FLAGS
88
-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
99

10+
# Do not enforce checks for LLVM's ABI-breaking build settings.
11+
# The demangler uses some header-only code from LLVM's ADT classes,
12+
# but we do not want to link libSupport into the demangler. These checks rely
13+
# on the presence of symbols in libSupport to identify how the code was
14+
# built and cause link failures for mismatches. Without linking that library,
15+
# we get link failures regardless, so instead, this just disables the checks.
16+
append("-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
17+
1018
swift_install_in_component(compiler
1119
TARGETS swiftDemangle
1220
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"

‎branches/master-next/test/DebugInfo/local-vars.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// RUN: %target-swift-frontend %t.swift -g -c -o %t.o
88
// RUN: %llvm-dwarfdump %t.o \
99
// RUN: | %FileCheck %t.swift --check-prefix=DWARF
10-
// RUN: %llvm-dwarfdump --verify %t.o
10+
// DISABLED_RDAR_43340064 %llvm-dwarfdump --verify %t.o
1111
// RUN: %target-swift-frontend %t.swift -O -g -emit-ir -o - \
1212
// RUN: | %FileCheck %t.swift --check-prefix=OPTZNS
1313

‎branches/master-next/test/PrintAsObjC/lit.local.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config.substitutions.insert(0, ('%check-in-clang',
55
'%%clang -fsyntax-only -x objective-c-header -fobjc-arc -fmodules '
66
'-fmodules-validate-system-headers '
77
'-Weverything -Werror -Wno-unused-macros -Wno-incomplete-module '
8-
'-Wno-auto-import '
8+
'-Wno-auto-import -Wno-objc-property-assign-on-object-type '
99
'-F %%clang-importer-sdk-path/frameworks '
1010
'-I %%clang-include-dir '
1111
'-isysroot %r/Inputs/clang-importer-sdk' % config.test_source_root) )

0 commit comments

Comments
 (0)