Skip to content

Commit e731b95

Browse files
aschwaighoferaschwaighofer
authored
---
yaml --- r: 343469 b: refs/heads/master-rebranch c: 395bfc9 h: refs/heads/master i: 343467: 6cec2fd
1 parent b17bb10 commit e731b95

21 files changed

+26
-38
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14551455
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14561456
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14571457
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1458-
refs/heads/master-rebranch: 55efcb74ae8aacd74f57a6e6c08cf53ca5a3dcba
1458+
refs/heads/master-rebranch: 395bfc9415e0a4c7ece180e7c90440ae8c5a5724
14591459
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14601460
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14611461
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

‎branches/master-rebranch/lib/Frontend/ParseableInterfaceModuleLoader.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "swift/Frontend/ParseableInterfaceSupport.h"
2727
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
2828
#include "swift/SILOptimizer/PassManager/Passes.h"
29-
#include "swift/Serialization/ModuleFormat.h"
3029
#include "swift/Serialization/SerializationOptions.h"
3130
#include "swift/Serialization/Validation.h"
3231
#include "clang/Basic/Module.h"

‎branches/master-rebranch/lib/Frontend/ParseableInterfaceSupport.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "swift/Frontend/ParseableInterfaceSupport.h"
2525
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
2626
#include "swift/SILOptimizer/PassManager/Passes.h"
27-
#include "swift/Serialization/ModuleFormat.h"
2827
#include "swift/Serialization/SerializationOptions.h"
2928
#include "swift/Serialization/Validation.h"
3029
#include "clang/Basic/Module.h"

‎branches/master-rebranch/lib/IDE/ModuleInterfacePrinting.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "swift/ClangImporter/ClangImporter.h"
2525
#include "swift/ClangImporter/ClangModule.h"
2626
#include "swift/Parse/Token.h"
27-
#include "swift/Serialization/ModuleFile.h"
2827
#include "swift/Subsystems.h"
2928
#include "swift/Serialization/SerializedModuleLoader.h"
3029
#include "clang/AST/ASTContext.h"

‎branches/master-rebranch/include/swift/Serialization/BCReadingExtras.h renamed to ‎branches/master-rebranch/lib/Serialization/BCReadingExtras.h

File renamed without changes.

‎branches/master-rebranch/include/swift/Serialization/DeclTypeRecordNodes.def renamed to ‎branches/master-rebranch/lib/Serialization/DeclTypeRecordNodes.def

File renamed without changes.

‎branches/master-rebranch/lib/Serialization/Deserialization.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
#include "BCReadingExtras.h"
1314
#include "DeserializationErrors.h"
14-
#include "swift/Serialization/ModuleFile.h"
15-
#include "swift/Serialization/ModuleFormat.h"
15+
#include "ModuleFile.h"
16+
#include "ModuleFormat.h"
1617
#include "swift/AST/ASTContext.h"
1718
#include "swift/AST/DiagnosticsSema.h"
1819
#include "swift/AST/Expr.h"
@@ -27,7 +28,6 @@
2728
#include "swift/AST/TypeCheckRequests.h"
2829
#include "swift/ClangImporter/ClangImporter.h"
2930
#include "swift/ClangImporter/ClangModule.h"
30-
#include "swift/Serialization/BCReadingExtras.h"
3131
#include "swift/Serialization/SerializedModuleLoader.h"
3232
#include "swift/Basic/Defer.h"
3333
#include "swift/Basic/Statistic.h"
@@ -83,7 +83,7 @@ namespace {
8383
static const char *getRecordKindString(decls_block::RecordKind Kind) {
8484
switch (Kind) {
8585
#define RECORD(Id) case decls_block::Id: return #Id;
86-
#include "swift/Serialization/DeclTypeRecordNodes.def"
86+
#include "DeclTypeRecordNodes.def"
8787
}
8888

8989
llvm_unreachable("Unhandled RecordKind in switch.");
@@ -1950,7 +1950,7 @@ static bool isDeclAttrRecord(unsigned ID) {
19501950
using namespace decls_block;
19511951
switch (ID) {
19521952
#define DECL_ATTR(NAME, CLASS, ...) case CLASS##_DECL_ATTR: return true;
1953-
#include "swift/Serialization/DeclTypeRecordNodes.def"
1953+
#include "DeclTypeRecordNodes.def"
19541954
default: return false;
19551955
}
19561956
}

‎branches/master-rebranch/lib/Serialization/DeserializationErrors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#ifndef SWIFT_SERIALIZATION_DESERIALIZATIONERRORS_H
1414
#define SWIFT_SERIALIZATION_DESERIALIZATIONERRORS_H
1515

16+
#include "ModuleFormat.h"
1617
#include "swift/AST/Identifier.h"
1718
#include "swift/AST/Module.h"
18-
#include "swift/Serialization/ModuleFormat.h"
1919
#include "llvm/Support/Error.h"
2020
#include "llvm/Support/PrettyStackTrace.h"
2121

‎branches/master-rebranch/lib/Serialization/DeserializeSIL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
#define DEBUG_TYPE "deserialize"
1414
#include "DeserializeSIL.h"
1515

16+
#include "BCReadingExtras.h"
1617
#include "DeserializationErrors.h"
18+
#include "ModuleFile.h"
1719
#include "SILFormat.h"
1820

1921
#include "SILSerializationFunctionBuilder.h"
@@ -27,8 +29,6 @@
2729
#include "swift/SIL/SILDebugScope.h"
2830
#include "swift/SIL/SILModule.h"
2931
#include "swift/SIL/SILUndef.h"
30-
#include "swift/Serialization/BCReadingExtras.h"
31-
#include "swift/Serialization/ModuleFile.h"
3232

3333
#include "llvm/ADT/Statistic.h"
3434
#include "llvm/ADT/StringExtras.h"

‎branches/master-rebranch/lib/Serialization/DeserializeSIL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "SILFormat.h"
14+
#include "ModuleFile.h"
1415
#include "swift/SIL/SILModule.h"
15-
#include "swift/Serialization/ModuleFile.h"
1616
#include "swift/Serialization/SerializedSILLoader.h"
1717

1818
#include "llvm/ADT/DenseMap.h"

‎branches/master-rebranch/lib/Serialization/ModuleFile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "swift/Serialization/ModuleFile.h"
13+
#include "ModuleFile.h"
14+
#include "BCReadingExtras.h"
1415
#include "DeserializationErrors.h"
1516
#include "DocFormat.h"
16-
#include "swift/Serialization/ModuleFormat.h"
17+
#include "ModuleFormat.h"
1718
#include "swift/Serialization/SerializationOptions.h"
1819
#include "swift/Subsystems.h"
1920
#include "swift/AST/ASTContext.h"
@@ -25,7 +26,6 @@
2526
#include "swift/AST/USRGeneration.h"
2627
#include "swift/Basic/Range.h"
2728
#include "swift/ClangImporter/ClangImporter.h"
28-
#include "swift/Serialization/BCReadingExtras.h"
2929
#include "swift/Serialization/SerializedModuleLoader.h"
3030
#include "llvm/ADT/StringExtras.h"
3131
#include "llvm/Support/Chrono.h"

‎branches/master-rebranch/include/swift/Serialization/ModuleFile.h renamed to ‎branches/master-rebranch/lib/Serialization/ModuleFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#ifndef SWIFT_SERIALIZATION_MODULEFILE_H
1414
#define SWIFT_SERIALIZATION_MODULEFILE_H
1515

16+
#include "ModuleFormat.h"
1617
#include "swift/AST/Identifier.h"
1718
#include "swift/AST/LazyResolver.h"
1819
#include "swift/AST/LinkLibrary.h"
1920
#include "swift/AST/Module.h"
2021
#include "swift/AST/RawComment.h"
2122
#include "swift/AST/TypeLoc.h"
22-
#include "swift/Serialization/ModuleFormat.h"
2323
#include "swift/Serialization/Validation.h"
2424
#include "swift/Basic/LLVM.h"
2525
#include "llvm/ADT/ArrayRef.h"

‎branches/master-rebranch/include/swift/Serialization/ModuleFormat.h renamed to ‎branches/master-rebranch/lib/Serialization/ModuleFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ namespace decls_block {
761761
enum RecordKind : uint8_t {
762762
#define RECORD(Id) Id,
763763
#define RECORD_VAL(Id, Value) Id = Value,
764-
#include "swift/Serialization/DeclTypeRecordNodes.def"
764+
#include "DeclTypeRecordNodes.def"
765765
};
766766

767767
using BuiltinAliasTypeLayout = BCRecordLayout<

‎branches/master-rebranch/lib/Serialization/SILFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef SWIFT_SERIALIZATION_SILFORMAT_H
1919
#define SWIFT_SERIALIZATION_SILFORMAT_H
2020

21-
#include "swift/Serialization/ModuleFormat.h"
21+
#include "ModuleFormat.h"
2222

2323
namespace swift {
2424
namespace serialization {

‎branches/master-rebranch/lib/Serialization/Serialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ void Serializer::writeBlockInfoBlock() {
728728

729729
BLOCK(DECLS_AND_TYPES_BLOCK);
730730
#define RECORD(X) BLOCK_RECORD(decls_block, X);
731-
#include "swift/Serialization/DeclTypeRecordNodes.def"
731+
#include "DeclTypeRecordNodes.def"
732732

733733
BLOCK(IDENTIFIER_DATA_BLOCK);
734734
BLOCK_RECORD(identifier_block, IDENTIFIER_DATA);

‎branches/master-rebranch/lib/Serialization/Serialization.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef SWIFT_SERIALIZATION_SERIALIZATION_H
1818
#define SWIFT_SERIALIZATION_SERIALIZATION_H
1919

20-
#include "swift/Serialization/ModuleFormat.h"
20+
#include "ModuleFormat.h"
2121
#include "swift/Serialization/SerializationOptions.h"
2222
#include "swift/Subsystems.h"
2323
#include "swift/AST/Identifier.h"

‎branches/master-rebranch/lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "swift/Serialization/SerializedModuleLoader.h"
14-
#include "swift/Serialization/ModuleFile.h"
14+
#include "ModuleFile.h"
1515
#include "swift/AST/ASTContext.h"
1616
#include "swift/AST/DiagnosticsSema.h"
1717
#include "swift/Basic/Defer.h"

‎branches/master-rebranch/lib/Serialization/SerializedSILLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define DEBUG_TYPE "serialized-sil-loader"
1414
#include "swift/Serialization/SerializedSILLoader.h"
1515
#include "DeserializeSIL.h"
16-
#include "swift/Serialization/ModuleFile.h"
16+
#include "ModuleFile.h"
1717
#include "swift/Serialization/SerializedModuleLoader.h"
1818
#include "swift/SIL/SILModule.h"
1919
#include "swift/AST/ASTMangler.h"

‎branches/master-rebranch/tools/driver/modulewrap_main.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "swift/Frontend/Frontend.h"
2323
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
2424
#include "swift/Option/Options.h"
25-
#include "swift/Serialization/ModuleFormat.h"
25+
#include "swift/Serialization/Validation.h"
2626
#include "swift/SIL/SILModule.h"
2727
#include "swift/Subsystems.h"
2828
#include "llvm/ADT/ArrayRef.h"
@@ -146,13 +146,11 @@ int modulewrap_main(ArrayRef<const char *> Args, const char *Argv0,
146146
}
147147

148148
// Superficially verify that the input is a swift module file.
149-
llvm::BitstreamCursor Cursor(ErrOrBuf.get()->getMemBufferRef());
150-
for (unsigned char Byte : serialization::SWIFTMODULE_SIGNATURE)
151-
if (Cursor.AtEndOfStream() || Cursor.Read(8) != Byte) {
152-
Instance.getDiags().diagnose(SourceLoc(), diag::error_parse_input_file,
153-
Filename, "signature mismatch");
154-
return 1;
155-
}
149+
if (!serialization::isSerializedAST(ErrOrBuf.get()->getBuffer())) {
150+
Instance.getDiags().diagnose(SourceLoc(), diag::error_parse_input_file,
151+
Filename, "signature mismatch");
152+
return 1;
153+
}
156154

157155
// Wrap the bitstream in a module object file. To use the ClangImporter to
158156
// create the module loader, we need to properly set the runtime library path.

‎branches/master-rebranch/validation-test/Reflection/inherits_NSObject.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99

10-
// REQUIRES: OS=macosx || OS=ios || OS=tvos
11-
// NOTE: Test is temporarily disabled for watchOS until we can figure out why
12-
// it's failing there. rdar://problem/50898688
13-
1410
import Foundation
1511
import simd
1612

‎branches/master-rebranch/validation-test/Reflection/inherits_ObjCClasses.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
// REQUIRES: objc_interop
1111
// REQUIRES: executable_test
12-
// REQUIRES: OS=macosx || OS=ios || OS=tvos
13-
// NOTE: Test is temporarily disabled for watchOS until we can figure out why
14-
// it's failing there. rdar://problem/50898688
1512

1613
import simd
1714
import ObjCClasses

0 commit comments

Comments
 (0)