Skip to content

Commit 5d99fe6

Browse files
hamishknighthamishknight
committed
Rename get() -> unbridged() on bridging wrappers
1 parent d67dc0a commit 5d99fe6

File tree

15 files changed

+320
-282
lines changed

15 files changed

+320
-282
lines changed

‎include/swift/AST/ASTBridging.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class BridgedDiagnosticArgument {
150150
BridgedDiagnosticArgument(const swift::DiagnosticArgument &arg) {
151151
*reinterpret_cast<swift::DiagnosticArgument *>(&storage) = arg;
152152
}
153-
const swift::DiagnosticArgument &get() const {
153+
const swift::DiagnosticArgument &unbridged() const {
154154
return *reinterpret_cast<const swift::DiagnosticArgument *>(&storage);
155155
}
156156
#endif
@@ -167,7 +167,7 @@ class BridgedDiagnosticFixIt {
167167
BridgedDiagnosticFixIt(const swift::DiagnosticInfo::FixIt &fixit){
168168
*reinterpret_cast<swift::DiagnosticInfo::FixIt *>(&storage) = fixit;
169169
}
170-
const swift::DiagnosticInfo::FixIt &get() const {
170+
const swift::DiagnosticInfo::FixIt &unbridged() const {
171171
return *reinterpret_cast<const swift::DiagnosticInfo::FixIt *>(&storage);
172172
}
173173
#endif

‎include/swift/AST/ASTBridgingImpl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
2222
//===----------------------------------------------------------------------===//
2323

2424
BridgedStringRef BridgedNominalTypeDecl_getName(BridgedNominalTypeDecl decl) {
25-
return decl.get()->getName().str();
25+
return decl.unbridged()->getName().str();
2626
}
2727

2828
bool BridgedNominalTypeDecl_isGlobalActor(BridgedNominalTypeDecl decl) {
29-
return decl.get()->isGlobalActor();
29+
return decl.unbridged()->isGlobalActor();
3030
}
3131

3232
//===----------------------------------------------------------------------===//
3333
// MARK: BridgedVarDecl
3434
//===----------------------------------------------------------------------===//
3535

3636
BridgedStringRef BridgedVarDecl_getUserFacingName(BridgedVarDecl decl) {
37-
return decl.get()->getBaseName().userFacingName();
37+
return decl.unbridged()->getBaseName().userFacingName();
3838
}
3939

4040
SWIFT_END_NULLABILITY_ANNOTATIONS

‎include/swift/Basic/BasicBridging.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ typedef uintptr_t SwiftUInt;
7979
Bridged##Name(swift::Node * Nullability ptr) : Ptr(ptr) {} \
8080
\
8181
SWIFT_UNAVAILABLE("Use '.raw' instead") \
82-
swift::Node * Nullability get() const { return Ptr; } \
82+
swift::Node * Nullability unbridged() const { return Ptr; } \
8383
}; \
8484
\
8585
SWIFT_NAME("getter:Bridged" #Name ".raw(self:)") \
8686
inline void * Nullability Bridged##Name##_getRaw(Bridged##Name bridged) { \
87-
return bridged.get(); \
87+
return bridged.unbridged(); \
8888
} \
8989
\
9090
SWIFT_NAME("Bridged" #Name ".init(raw:)") \
@@ -123,7 +123,7 @@ class BridgedArrayRef {
123123
: Data(arr.data()), Length(arr.size()) {}
124124

125125
template <typename T>
126-
llvm::ArrayRef<T> get() const {
126+
llvm::ArrayRef<T> unbridged() const {
127127
return {static_cast<const T *>(Data), Length};
128128
}
129129
#endif
@@ -196,7 +196,7 @@ class BridgedStringRef {
196196
BridgedStringRef(llvm::StringRef sref)
197197
: Data(sref.data()), Length(sref.size()) {}
198198

199-
llvm::StringRef get() const { return llvm::StringRef(Data, Length); }
199+
llvm::StringRef unbridged() const { return llvm::StringRef(Data, Length); }
200200
#endif
201201

202202
BridgedStringRef() : Data(nullptr), Length(0) {}
@@ -226,7 +226,7 @@ class BridgedOwnedString {
226226
#ifdef USED_IN_CPP_SOURCE
227227
BridgedOwnedString(const std::string &stringToCopy);
228228

229-
llvm::StringRef getRef() const { return llvm::StringRef(Data, Length); }
229+
llvm::StringRef unbridgedRef() const { return llvm::StringRef(Data, Length); }
230230
#endif
231231

232232
void destroy() const;
@@ -258,7 +258,7 @@ class BridgedSourceLoc {
258258
#ifdef USED_IN_CPP_SOURCE
259259
BridgedSourceLoc(swift::SourceLoc loc) : Raw(loc.getOpaquePointerValue()) {}
260260

261-
swift::SourceLoc get() const {
261+
swift::SourceLoc unbridged() const {
262262
return swift::SourceLoc(
263263
llvm::SMLoc::getFromPointer(static_cast<const char *>(Raw)));
264264
}

‎include/swift/Basic/BasicBridgingImpl.h‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,32 @@ SwiftInt BridgedData_count(BridgedData data) {
4444
//===----------------------------------------------------------------------===//
4545

4646
const uint8_t *_Nullable BridgedStringRef_data(BridgedStringRef str) {
47-
return (const uint8_t *)str.get().data();
47+
return (const uint8_t *)str.unbridged().data();
4848
}
4949

5050
SwiftInt BridgedStringRef_count(BridgedStringRef str) {
51-
return (SwiftInt)str.get().size();
51+
return (SwiftInt)str.unbridged().size();
5252
}
5353

54-
bool BridgedStringRef_empty(BridgedStringRef str) { return str.get().empty(); }
54+
bool BridgedStringRef_empty(BridgedStringRef str) {
55+
return str.unbridged().empty();
56+
}
5557

5658
//===----------------------------------------------------------------------===//
5759
// MARK: BridgedOwnedString
5860
//===----------------------------------------------------------------------===//
5961

6062
const uint8_t *_Nullable BridgedOwnedString_data(BridgedOwnedString str) {
61-
auto *data = str.getRef().data();
63+
auto *data = str.unbridgedRef().data();
6264
return (const uint8_t *)(data ? data : "");
6365
}
6466

6567
SwiftInt BridgedOwnedString_count(BridgedOwnedString str) {
66-
return (SwiftInt)str.getRef().size();
68+
return (SwiftInt)str.unbridgedRef().size();
6769
}
6870

6971
bool BridgedOwnedString_empty(BridgedOwnedString str) {
70-
return str.getRef().empty();
72+
return str.unbridgedRef().empty();
7173
}
7274

7375
//===----------------------------------------------------------------------===//
@@ -79,7 +81,7 @@ bool BridgedSourceLoc_isValid(BridgedSourceLoc loc) {
7981
}
8082

8183
BridgedSourceLoc BridgedSourceLoc::advancedBy(size_t n) const {
82-
return BridgedSourceLoc(get().getAdvancedLoc(n));
84+
return BridgedSourceLoc(unbridged().getAdvancedLoc(n));
8385
}
8486

8587
SWIFT_END_NULLABILITY_ANNOTATIONS

‎include/swift/SIL/SILBridging.h‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct BridgedType {
8080
#ifdef USED_IN_CPP_SOURCE
8181
BridgedType(swift::SILType t) : opaqueValue(t.getOpaqueValue()) {}
8282

83-
swift::SILType get() const {
83+
swift::SILType unbridged() const {
8484
return swift::SILType::getFromOpaqueValue(opaqueValue);
8585
}
8686
#endif
@@ -383,7 +383,7 @@ struct BridgedMultiValueResult {
383383
SwiftObject obj;
384384

385385
#ifdef USED_IN_CPP_SOURCE
386-
swift::MultipleValueInstructionResult * _Nonnull get() const {
386+
swift::MultipleValueInstructionResult * _Nonnull unbridged() const {
387387
return static_cast<swift::MultipleValueInstructionResult *>(obj);
388388
}
389389
#endif
@@ -399,7 +399,7 @@ struct BridgedSubstitutionMap {
399399
BridgedSubstitutionMap(swift::SubstitutionMap map) {
400400
*reinterpret_cast<swift::SubstitutionMap *>(&storage) = map;
401401
}
402-
swift::SubstitutionMap get() const {
402+
swift::SubstitutionMap unbridged() const {
403403
return *reinterpret_cast<const swift::SubstitutionMap *>(&storage);
404404
}
405405
#endif
@@ -414,8 +414,8 @@ struct BridgedTypeArray {
414414
#ifdef USED_IN_CPP_SOURCE
415415
BridgedTypeArray(llvm::ArrayRef<swift::Type> types) : typeArray(types) {}
416416

417-
llvm::ArrayRef<swift::Type> get() const {
418-
return typeArray.get<swift::Type>();
417+
llvm::ArrayRef<swift::Type> unbridged() const {
418+
return typeArray.unbridged<swift::Type>();
419419
}
420420
#endif
421421

@@ -435,8 +435,8 @@ struct BridgedSILTypeArray {
435435
BridgedSILTypeArray(llvm::ArrayRef<swift::SILType> silTypes)
436436
: typeArray(silTypes) {}
437437

438-
llvm::ArrayRef<swift::SILType> get() const {
439-
return typeArray.get<swift::SILType>();
438+
llvm::ArrayRef<swift::SILType> unbridged() const {
439+
return typeArray.unbridged<swift::SILType>();
440440
}
441441
#endif
442442

@@ -496,7 +496,7 @@ struct BridgedInstruction {
496496
template <class I> I *_Nonnull getAs() const {
497497
return llvm::cast<I>(static_cast<swift::SILNode *>(obj)->castToInstruction());
498498
}
499-
swift::SILInstruction * _Nonnull get() const {
499+
swift::SILInstruction * _Nonnull unbridged() const {
500500
return getAs<swift::SILInstruction>();
501501
}
502502
#endif
@@ -676,7 +676,7 @@ struct OptionalBridgedInstruction {
676676
OptionalSwiftObject obj;
677677

678678
#ifdef USED_IN_CPP_SOURCE
679-
swift::SILInstruction * _Nullable get() const {
679+
swift::SILInstruction * _Nullable unbridged() const {
680680
if (!obj)
681681
return nullptr;
682682
return llvm::cast<swift::SILInstruction>(static_cast<swift::SILNode *>(obj)->castToInstruction());
@@ -704,7 +704,7 @@ struct OptionalBridgedBasicBlock {
704704
OptionalSwiftObject obj;
705705

706706
#ifdef USED_IN_CPP_SOURCE
707-
swift::SILBasicBlock * _Nullable get() const {
707+
swift::SILBasicBlock * _Nullable unbridged() const {
708708
return obj ? static_cast<swift::SILBasicBlock *>(obj) : nullptr;
709709
}
710710
#endif
@@ -719,7 +719,7 @@ struct BridgedBasicBlock {
719719
#ifdef USED_IN_CPP_SOURCE
720720
BridgedBasicBlock(swift::SILBasicBlock * _Nonnull block) : obj(block) {
721721
}
722-
swift::SILBasicBlock * _Nonnull get() const {
722+
swift::SILBasicBlock * _Nonnull unbridged() const {
723723
return static_cast<swift::SILBasicBlock *>(obj);
724724
}
725725
#endif
@@ -840,12 +840,14 @@ struct BridgedBuilder{
840840
BridgedLocation loc;
841841

842842
#ifdef USED_IN_CPP_SOURCE
843-
swift::SILBuilder get() const {
843+
swift::SILBuilder unbridged() const {
844844
switch (insertAt) {
845845
case BridgedBuilder::InsertAt::beforeInst:
846-
return swift::SILBuilder(BridgedInstruction(insertionObj).get(), loc.getLoc().getScope());
846+
return swift::SILBuilder(BridgedInstruction(insertionObj).unbridged(),
847+
loc.getLoc().getScope());
847848
case BridgedBuilder::InsertAt::endOfBlock:
848-
return swift::SILBuilder(BridgedBasicBlock(insertionObj).get(), loc.getLoc().getScope());
849+
return swift::SILBuilder(BridgedBasicBlock(insertionObj).unbridged(),
850+
loc.getLoc().getScope());
849851
case BridgedBuilder::InsertAt::intoGlobal:
850852
return swift::SILBuilder(BridgedGlobalVar(insertionObj).getGlobal());
851853
}

0 commit comments

Comments
 (0)