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

Check that "@testable import Foo" is only used to import testable modules.

Browse Source 
(i.e. modules compiled with -enable-testing)

Part of testability (rdar://problem/17732115)

Swift SVN r26293
This commit is contained in:
Jordan Rose
2015-03-19 02:20:41 +00:00
parent c6739b6b6c
commit e6c2131bda
14 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/ModuleFile.cpp
View File

@@ -106,6 +106,9 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
options_block::IsSIBLayout::readRecord(scratch, IsSIB);
extendedInfo.setIsSIB(IsSIB);
break;
case options_block::IS_TESTABLE:
extendedInfo.setIsTestable(true);
break;
default:
// Unknown options record, possibly for use by a future version of the
// module format.
@@ -710,7 +713,8 @@ static bool isTargetTooNew(const llvm::Triple &moduleTarget,
ModuleFile::ModuleFile(
std::unique_ptr<llvm::MemoryBuffer> moduleInputBuffer,
std::unique_ptr<llvm::MemoryBuffer> moduleDocInputBuffer,
bool isFramework)
bool isFramework,
serialization::ExtendedValidationInfo *extInfo)
: ModuleInputBuffer(std::move(moduleInputBuffer)),
ModuleDocInputBuffer(std::move(moduleDocInputBuffer)),
ModuleInputReader(getStartBytePtr(this->ModuleInputBuffer.get()),
@@ -741,7 +745,7 @@ ModuleFile::ModuleFile(
case CONTROL_BLOCK_ID: {
cursor.EnterSubBlock(CONTROL_BLOCK_ID);
auto info = validateControlBlock(cursor, scratch, nullptr);
auto info = validateControlBlock(cursor, scratch, extInfo);
if (info.status != Status::Valid) {
error(info.status);
return;