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

Add a convenience function to map a CanType+StructDecl to the mapped

Browse Source 
CanType.  This doesn't really fit on SILBuilder, but until StructType 
and BoundGenericStructType are merged, this will do.


Swift SVN r9336
This commit is contained in:
Chris Lattner
2013-10-14 23:42:41 +00:00
parent d8676b7bbe
commit a6cde9cd8d
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/swift/SIL/SILBuilder.h
View File

@@ -30,13 +30,6 @@ class SILBuilder {
/// instruction is recorded in this list. /// instruction is recorded in this list.
SmallVectorImpl<SILInstruction*> *InsertedInstrs = nullptr; SmallVectorImpl<SILInstruction*> *InsertedInstrs = nullptr;
public: public:
static SILType getTupleElementType(SILType Ty, unsigned EltNo,
SILValueCategory Cat);
static SILType getStructFieldType(SILType Ty, VarDecl *Field,
SILValueCategory Cat);
static SILType getPartialApplyResultType(SILType Ty, unsigned ArgCount,
SILModule &M);
SILBuilder(SILFunction &F) : F(F), BB(0) {} SILBuilder(SILFunction &F) : F(F), BB(0) {}
explicit SILBuilder(SILInstruction *I, explicit SILBuilder(SILInstruction *I,
@@ -118,6 +111,18 @@ public:
return InsertedInstrs; return InsertedInstrs;
} }
//===--------------------------------------------------------------------===//
// Type remapping
//===--------------------------------------------------------------------===//
static SILType getTupleElementType(SILType Ty, unsigned EltNo,
SILValueCategory Cat);
static SILType getStructFieldType(SILType Ty, VarDecl *Field,
SILValueCategory Cat);
static CanType getStructFieldType(CanType Ty, VarDecl *Field);
static SILType getPartialApplyResultType(SILType Ty, unsigned ArgCount,
SILModule &M);
//===--------------------------------------------------------------------===// //===--------------------------------------------------------------------===//
// CFG Manipulation // CFG Manipulation
//===--------------------------------------------------------------------===// //===--------------------------------------------------------------------===//

10
lib/SIL/SILBuilder.cpp
View File

@@ -17,6 +17,12 @@ using namespace swift;
// SILBuilder Implementation // SILBuilder Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
CanType SILBuilder::getStructFieldType(CanType Ty, VarDecl *Field) {
return Ty->getTypeOfMember(Field->getModuleContext(), Field, nullptr)
->getCanonicalType();
}
SILType SILBuilder::getTupleElementType(SILType Ty, unsigned EltNo, SILType SILBuilder::getTupleElementType(SILType Ty, unsigned EltNo,
SILValueCategory Cat) { SILValueCategory Cat) {
TupleType *TT = Ty.getAs<TupleType>(); TupleType *TT = Ty.getAs<TupleType>();
@@ -27,9 +33,7 @@ SILType SILBuilder::getTupleElementType(SILType Ty, unsigned EltNo,
SILType SILBuilder::getStructFieldType(SILType Ty, VarDecl *Field, SILType SILBuilder::getStructFieldType(SILType Ty, VarDecl *Field,
SILValueCategory Cat) { SILValueCategory Cat) {
assert(Field->getDeclContext() == Ty.getStructOrBoundGenericStruct()); assert(Field->getDeclContext() == Ty.getStructOrBoundGenericStruct());
auto FieldTy = Ty.getSwiftRValueType() auto FieldTy = getStructFieldType(Ty.getSwiftRValueType(), Field);
->getTypeOfMember(Field->getModuleContext(), Field, nullptr)
->getCanonicalType();
return SILType::getPrimitiveType(FieldTy, Cat); return SILType::getPrimitiveType(FieldTy, Cat);
} }