averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

AST: Add Throws flag and ThrowsLoc to AbstractFunctionDecl

Browse Source 
The verifier now asserts that Throws, ThrowsLoc and isBodyThrowing()
match up.

Also, add /*Label=*/ comments where necessary to make the long argument
lists easier to read, and cleaned up some inconsistent naming conventions.

I caught a case where ClangImporter where we were passing in a loc as
StaticLoc instead of FuncLoc, but probably this didn't affect anything.
This commit is contained in:
Slava Pestov
2016-05-18 15:34:39 -07:00
parent 09c57d32c7
commit 170992c39f
25 changed files with 401 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/Serialization/ModuleFormat.h
View File

@@ -53,7 +53,7 @@ const uint16_t VERSION_MAJOR = 0;
/// in source control, you should also update the comment to briefly
/// describe what change you made. The content of this comment isn't important;
/// it just ensures a conflict if two people change the module format.
const uint16_t VERSION_MINOR = 249; // Last change: SIL clang decls
const uint16_t VERSION_MINOR = 250; // Last change: Add Throws bit
using DeclID = PointerEmbeddedInt<unsigned, 31>;
using DeclIDField = BCFixed<31>;
@@ -851,6 +851,7 @@ namespace decls_block {
BCFixed<1>, // implicit?
BCFixed<1>, // objc?
BCFixed<1>, // stub implementation?
BCFixed<1>, // throws?
CtorInitializerKindField, // initializer kind
TypeIDField, // type (signature)
TypeIDField, // type (interface)
@@ -904,6 +905,7 @@ namespace decls_block {
BCFixed<1>, // explicitly objc?
BCFixed<1>, // mutating?
BCFixed<1>, // has dynamic self?
BCFixed<1>, // throws?
BCVBR<5>, // number of parameter patterns
TypeIDField, // type (signature)
TypeIDField, // interface type