Skip to content

Commit 6407f9a

Browse files
committed
remove the allocVector builtin
It's not needed anymore, because the "FixedArray" experimental feature is replaced by inline-arrays.
1 parent 83aaccc commit 6407f9a

File tree

10 files changed

+0
-35
lines changed

10 files changed

+0
-35
lines changed

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyBuiltin.swift

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ extension BuiltinInst : OnoneSimplifyable {
4747
.AssignCopyArrayFrontToBack,
4848
.AssignCopyArrayBackToFront,
4949
.AssignTakeArray,
50-
.AllocVector,
5150
.IsPOD:
5251
optimizeArgumentToThinMetatype(argument: 0, context)
5352
case .ICMP_EQ:

include/swift/AST/Builtins.def

-3
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,6 @@ BUILTIN_MISC_OPERATION(UnprotectedStackAlloc, "unprotectedStackAlloc", "", Speci
638638
/// Builtin.stackAlloc(), is deallocated from the stack.
639639
BUILTIN_MISC_OPERATION(StackDealloc, "stackDealloc", "", Special)
640640

641-
/// allocVector<Element>(Element.Type, Builtin.Word) -> Builtin.RawPointer
642-
BUILTIN_MISC_OPERATION(AllocVector, "allocVector", "", Special)
643-
644641
/// Fence has type () -> ().
645642
BUILTIN_MISC_OPERATION(Fence, "fence", "", None)
646643

include/swift/Basic/Features.def

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskWithExecutor, 0, "Task create bu
158158
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor, 0, "Task create in discarding task group with extra executor preference")
159159
BASELINE_LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc")
160160
BASELINE_LANGUAGE_FEATURE(BuiltinUnprotectedStackAlloc, 0, "Builtin.unprotectedStackAlloc")
161-
BASELINE_LANGUAGE_FEATURE(BuiltinAllocVector, 0, "Builtin.allocVector")
162161
BASELINE_LANGUAGE_FEATURE(BuiltinTaskRunInline, 0, "Builtin.taskRunInline")
163162
BASELINE_LANGUAGE_FEATURE(BuiltinUnprotectedAddressOf, 0, "Builtin.unprotectedAddressOf")
164163
BASELINE_LANGUAGE_FEATURE(NewCxxMethodSafetyHeuristics, 0, "Only import C++ methods that return pointers (projections) on owned types as unsafe")

lib/AST/Builtins.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -1137,13 +1137,6 @@ static ValueDecl *getStackDeallocOperation(ASTContext &ctx, Identifier id) {
11371137
_void);
11381138
}
11391139

1140-
static ValueDecl *getAllocVectorOperation(ASTContext &ctx, Identifier id) {
1141-
return getBuiltinFunction(ctx, id, _thin,
1142-
_generics(_unrestricted),
1143-
_parameters(_metatype(_typeparam(0)), _word),
1144-
_rawPointer);
1145-
}
1146-
11471140
static ValueDecl *getFenceOperation(ASTContext &ctx, Identifier id) {
11481141
return getBuiltinFunction(ctx, id, _thin, _parameters(), _void);
11491142
}
@@ -3049,9 +3042,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
30493042
case BuiltinValueKind::StackDealloc:
30503043
return getStackDeallocOperation(Context, Id);
30513044

3052-
case BuiltinValueKind::AllocVector:
3053-
return getAllocVectorOperation(Context, Id);
3054-
30553045
case BuiltinValueKind::CastToNativeObject:
30563046
case BuiltinValueKind::UnsafeCastToNativeObject:
30573047
case BuiltinValueKind::CastFromNativeObject:

lib/IRGen/GenBuiltin.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -1475,15 +1475,6 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
14751475
return;
14761476
}
14771477

1478-
if (Builtin.ID == BuiltinValueKind::AllocVector) {
1479-
(void)args.claimAll();
1480-
IGF.emitTrap("escaped vector allocation", /*EmitUnreachable=*/true);
1481-
out.add(llvm::UndefValue::get(IGF.IGM.Int8PtrTy));
1482-
llvm::BasicBlock *contBB = llvm::BasicBlock::Create(IGF.IGM.getLLVMContext());
1483-
IGF.Builder.emitBlock(contBB);
1484-
return;
1485-
}
1486-
14871478
if (Builtin.ID == BuiltinValueKind::GetEnumTag) {
14881479
auto arg = args.claimNext();
14891480
auto ty = argTypes[0];

lib/SIL/IR/OperandOwnership.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,6 @@ BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, SSubOver)
867867
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, StackAlloc)
868868
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, UnprotectedStackAlloc)
869869
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, StackDealloc)
870-
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, AllocVector)
871870
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, SToSCheckedTrunc)
872871
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, SToUCheckedTrunc)
873872
BUILTIN_OPERAND_OWNERSHIP(InstantaneousUse, Expect)

lib/SIL/IR/ValueOwnership.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ CONSTANT_OWNERSHIP_BUILTIN(None, UToSCheckedTrunc)
561561
CONSTANT_OWNERSHIP_BUILTIN(None, StackAlloc)
562562
CONSTANT_OWNERSHIP_BUILTIN(None, UnprotectedStackAlloc)
563563
CONSTANT_OWNERSHIP_BUILTIN(None, StackDealloc)
564-
CONSTANT_OWNERSHIP_BUILTIN(None, AllocVector)
565564
CONSTANT_OWNERSHIP_BUILTIN(None, SToSCheckedTrunc)
566565
CONSTANT_OWNERSHIP_BUILTIN(None, SToUCheckedTrunc)
567566
CONSTANT_OWNERSHIP_BUILTIN(None, UToUCheckedTrunc)

lib/SIL/Utils/MemAccessUtils.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -2616,7 +2616,6 @@ static void visitBuiltinAddress(BuiltinInst *builtin,
26162616
case BuiltinValueKind::DeallocRaw:
26172617
case BuiltinValueKind::StackAlloc:
26182618
case BuiltinValueKind::UnprotectedStackAlloc:
2619-
case BuiltinValueKind::AllocVector:
26202619
case BuiltinValueKind::StackDealloc:
26212620
case BuiltinValueKind::Fence:
26222621
case BuiltinValueKind::StaticReport:

lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ static bool isBarrier(SILInstruction *inst) {
157157
case BuiltinValueKind::StackAlloc:
158158
case BuiltinValueKind::UnprotectedStackAlloc:
159159
case BuiltinValueKind::StackDealloc:
160-
case BuiltinValueKind::AllocVector:
161160
case BuiltinValueKind::AssumeAlignment:
162161
case BuiltinValueKind::GetEnumTag:
163162
case BuiltinValueKind::InjectEnumTag:

stdlib/public/core/Builtin.swift

-7
Original file line numberDiff line numberDiff line change
@@ -1105,10 +1105,3 @@ public // @SPI(OSLog)
11051105
func _getGlobalStringTablePointer(_ constant: String) -> UnsafePointer<CChar> {
11061106
return UnsafePointer<CChar>(Builtin.globalStringTablePointer(constant));
11071107
}
1108-
1109-
@_transparent
1110-
@_alwaysEmitIntoClient
1111-
public
1112-
func _allocateVector<Element>(elementType: Element.Type, capacity: Int) -> UnsafeMutablePointer<Element> {
1113-
return UnsafeMutablePointer(Builtin.allocVector(elementType, capacity._builtinWordValue))
1114-
}

0 commit comments

Comments
 (0)