Skip to content

Commit fbd2e4d

Browse files
jckarterjckarter
committed
Rename @asmname to @_silgen_name.
This reflects the fact that the attribute's only for compiler-internal use, and isn't really equivalent to C's asm attribute, since it doesn't change the calling convention to be C-compatible.
1 parent a3b6bef commit fbd2e4d

File tree

94 files changed

+253
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+253
-253
lines changed

‎include/swift/AST/Attr.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TYPE_ATTR(thick)
7777
// SimpleDeclAttr<DAK_##NAME>.
7878
//
7979

80-
DECL_ATTR(asmname, Asmname,
80+
DECL_ATTR(_silgen_name, SILGenName,
8181
OnFunc | OnConstructor | OnDestructor | LongAttribute |
8282
UserInaccessible, 0)
8383

‎include/swift/AST/Attr.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -553,21 +553,21 @@ class SimpleDeclAttr : public DeclAttribute {
553553
typedef SimpleDeclAttr<DAK_##CLASS> CLASS##Attr;
554554
#include "swift/AST/Attr.def"
555555

556-
/// Defines the @asmname attribute.
557-
class AsmnameAttr : public DeclAttribute {
556+
/// Defines the @_silgen_name attribute.
557+
class SILGenNameAttr : public DeclAttribute {
558558
public:
559-
AsmnameAttr(StringRef Name, SourceLoc AtLoc, SourceRange Range, bool Implicit)
560-
: DeclAttribute(DAK_Asmname, AtLoc, Range, Implicit),
559+
SILGenNameAttr(StringRef Name, SourceLoc AtLoc, SourceRange Range, bool Implicit)
560+
: DeclAttribute(DAK_SILGenName, AtLoc, Range, Implicit),
561561
Name(Name) {}
562562

563-
AsmnameAttr(StringRef Name, bool Implicit)
564-
: AsmnameAttr(Name, SourceLoc(), SourceRange(), /*Implicit=*/true) {}
563+
SILGenNameAttr(StringRef Name, bool Implicit)
564+
: SILGenNameAttr(Name, SourceLoc(), SourceRange(), /*Implicit=*/true) {}
565565

566566
/// The symbol name.
567567
const StringRef Name;
568568

569569
static bool classof(const DeclAttribute *DA) {
570-
return DA->getKind() == DAK_Asmname;
570+
return DA->getKind() == DAK_SILGenName;
571571
}
572572
};
573573

‎include/swift/AST/PrintOptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct PrintOptions {
115115
bool PrintImplicitAttrs = true;
116116

117117
/// Whether to print decl attributes that are only used internally,
118-
/// such as asmname, transparent, etc.
118+
/// such as _silgen_name, transparent, etc.
119119
bool PrintUserInaccessibleAttrs = true;
120120

121121
/// List of attribute kinds that should not be printed.

‎include/swift/Serialization/ModuleFormat.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ namespace decls_block {
894894
AccessibilityKindField, // accessibility
895895
BCArray<IdentifierIDField> // name components
896896
// The record is trailed by:
897-
// - its asmname, if any
897+
// - its _silgen_name, if any
898898
// - its generic parameters, if any
899899
// - body parameter patterns
900900
>;
@@ -1198,10 +1198,10 @@ namespace decls_block {
11981198
BCVBR<5> // index
11991199
>;
12001200

1201-
using AsmnameDeclAttrLayout = BCRecordLayout<
1202-
Asmname_DECL_ATTR,
1201+
using SILGenNameDeclAttrLayout = BCRecordLayout<
1202+
SILGenName_DECL_ATTR,
12031203
BCFixed<1>, // implicit flag
1204-
BCBlob // asmname
1204+
BCBlob // _silgen_name
12051205
>;
12061206

12071207
using AlignmentDeclAttrLayout = BCRecordLayout<

‎lib/AST/Attr.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ void DeclAttribute::print(ASTPrinter &Printer,
289289
Printer << "@_alignment(" << cast<AlignmentAttr>(this)->Value << ")";
290290
break;
291291

292-
case DAK_Asmname:
293-
Printer << "@asmname(\"" << cast<AsmnameAttr>(this)->Name << "\")";
292+
case DAK_SILGenName:
293+
Printer << "@_silgen_name(\"" << cast<SILGenNameAttr>(this)->Name << "\")";
294294
break;
295295

296296
case DAK_Available: {
@@ -417,8 +417,8 @@ StringRef DeclAttribute::getAttrName() const {
417417
case DAK_##CLASS: \
418418
return #NAME;
419419
#include "swift/AST/Attr.def"
420-
case DAK_Asmname:
421-
return "asmname";
420+
case DAK_SILGenName:
421+
return "_silgen_name";
422422
case DAK_Alignment:
423423
return "_alignment";
424424
case DAK_SwiftNativeObjCRuntimeBase:

‎lib/AST/Module.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ VarDecl *Module::getDSOHandle() {
421421
type, Files[0]);
422422
handleVar->setImplicit(true);
423423
handleVar->getAttrs().add(
424-
new (ctx) AsmnameAttr("__dso_handle", /*Implicit=*/true));
424+
new (ctx) SILGenNameAttr("__dso_handle", /*Implicit=*/true));
425425
handleVar->setAccessibility(Accessibility::Internal);
426426
DSOHandleAndFlags.setPointer(handleVar);
427427
return handleVar;

‎lib/IRGen/Linking.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void LinkEntity::mangle(raw_ostream &buffer) const {
221221
// entity ::= declaration // other declaration
222222
case Kind::Function:
223223
// As a special case, functions can have external asm names.
224-
if (auto AsmA = getDecl()->getAttrs().getAttribute<AsmnameAttr>()) {
224+
if (auto AsmA = getDecl()->getAttrs().getAttribute<SILGenNameAttr>()) {
225225
buffer << AsmA->Name;
226226
return;
227227
}

‎lib/Parse/ParseDecl.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
563563
break;
564564
}
565565

566-
case DAK_Asmname: {
566+
case DAK_SILGenName: {
567567
if (!consumeIf(tok::l_paren)) {
568568
diagnose(Loc, diag::attr_expected_lparen, AttrName,
569569
DeclAttribute::isDeclModifier(DK));
@@ -591,7 +591,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
591591
return false;
592592
}
593593

594-
// Diagnose using @asmname in a local scope. These don't
594+
// Diagnose using @_silgen_name in a local scope. These don't
595595
// actually work.
596596
if (CurDeclContext->isLocalContext()) {
597597
// Emit an error, but do not discard the attribute. This enables
@@ -600,7 +600,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
600600
}
601601

602602
if (!DiscardAttribute)
603-
Attributes.add(new (Context) AsmnameAttr(AsmName.getValue(), AtLoc,
603+
Attributes.add(new (Context) SILGenNameAttr(AsmName.getValue(), AtLoc,
604604
AttrRange, /*Implicit=*/false));
605605

606606
break;
@@ -1240,7 +1240,7 @@ bool Parser::parseVersionTuple(clang::VersionTuple &Version,
12401240

12411241
/// \verbatim
12421242
/// attribute:
1243-
/// 'asmname' '(' identifier ')'
1243+
/// '_silgen_name' '(' identifier ')'
12441244
/// 'semantics' '(' identifier ')'
12451245
/// 'infix' '=' numeric_constant
12461246
/// 'unary'
@@ -3204,8 +3204,8 @@ bool Parser::parseGetSetImpl(ParseDeclOptions Flags, Pattern *Indices,
32043204
// FIXME: Use outer '{' loc if isImplicitGet.
32053205
bool ExternalAsmName = false;
32063206
if (!isImplicitGet && !consumeIf(tok::l_brace)) {
3207-
// asmname'd accessors don't need bodies.
3208-
if (!Attributes.hasAttribute<AsmnameAttr>()) {
3207+
// _silgen_name'd accessors don't need bodies.
3208+
if (!Attributes.hasAttribute<SILGenNameAttr>()) {
32093209
diagnose(Tok, diag::expected_lbrace_accessor,
32103210
getAccessorNameForDiagnostic(Kind, addressorKind));
32113211
return true;

‎lib/SIL/SILDeclRef.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static void mangleConstant(SILDeclRef c, llvm::raw_ostream &buffer,
405405
// As a special case, functions can have external asm names.
406406
// Use the asm name only for the original non-thunked, non-curried entry
407407
// point.
408-
if (auto AsmA = c.getDecl()->getAttrs().getAttribute<AsmnameAttr>())
408+
if (auto AsmA = c.getDecl()->getAttrs().getAttribute<SILGenNameAttr>())
409409
if (!c.isForeignToNativeThunk() && !c.isNativeToForeignThunk()
410410
&& !c.isCurried) {
411411
buffer << AsmA->Name;

‎lib/Sema/TypeCheckAttr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AttributeEarlyChecker : public AttributeVisitor<AttributeEarlyChecker> {
4747
bool visitDeclAttribute(DeclAttribute *A) = delete;
4848

4949
#define IGNORED_ATTR(X) void visit##X##Attr(X##Attr *) {}
50-
IGNORED_ATTR(Asmname)
50+
IGNORED_ATTR(SILGenName)
5151
IGNORED_ATTR(Available)
5252
IGNORED_ATTR(Convenience)
5353
IGNORED_ATTR(Effects)
@@ -612,7 +612,7 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
612612

613613
IGNORED_ATTR(AutoClosure)
614614
IGNORED_ATTR(Alignment)
615-
IGNORED_ATTR(Asmname)
615+
IGNORED_ATTR(SILGenName)
616616
IGNORED_ATTR(Dynamic)
617617
IGNORED_ATTR(Exported)
618618
IGNORED_ATTR(Convenience)

‎lib/Sema/TypeCheckDecl.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3794,9 +3794,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
37943794
if (decl->isInvalid() || decl->isImplicit() || decl->hasClangNode())
37953795
return false;
37963796

3797-
// Functions can have asmname, semantics, and NSManaged attributes.
3797+
// Functions can have _silgen_name, semantics, and NSManaged attributes.
37983798
if (auto func = dyn_cast<AbstractFunctionDecl>(decl)) {
3799-
if (func->getAttrs().hasAttribute<AsmnameAttr>() ||
3799+
if (func->getAttrs().hasAttribute<SILGenNameAttr>() ||
38003800
func->getAttrs().hasAttribute<SemanticsAttr>() ||
38013801
func->getAttrs().hasAttribute<NSManagedAttr>())
38023802
return false;
@@ -4778,7 +4778,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
47784778

47794779
UNINTERESTING_ATTR(Accessibility)
47804780
UNINTERESTING_ATTR(Alignment)
4781-
UNINTERESTING_ATTR(Asmname)
4781+
UNINTERESTING_ATTR(SILGenName)
47824782
UNINTERESTING_ATTR(Exported)
47834783
UNINTERESTING_ATTR(IBAction)
47844784
UNINTERESTING_ATTR(IBDesignable)

‎lib/Serialization/Deserialization.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1789,11 +1789,11 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext) {
17891789
if (isDeclAttrRecord(recordID)) {
17901790
DeclAttribute *Attr = nullptr;
17911791
switch (recordID) {
1792-
case decls_block::Asmname_DECL_ATTR: {
1792+
case decls_block::SILGenName_DECL_ATTR: {
17931793
bool isImplicit;
1794-
serialization::decls_block::AsmnameDeclAttrLayout::readRecord(
1794+
serialization::decls_block::SILGenNameDeclAttrLayout::readRecord(
17951795
scratch, isImplicit);
1796-
Attr = new (ctx) AsmnameAttr(blobData, isImplicit);
1796+
Attr = new (ctx) SILGenNameAttr(blobData, isImplicit);
17971797
break;
17981798
}
17991799

‎lib/Serialization/Serialization.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1552,10 +1552,10 @@ void Serializer::writeDeclAttribute(const DeclAttribute *DA) {
15521552
}
15531553
#include "swift/AST/Attr.def"
15541554

1555-
case DAK_Asmname: {
1556-
auto *theAttr = cast<AsmnameAttr>(DA);
1557-
auto abbrCode = DeclTypeAbbrCodes[AsmnameDeclAttrLayout::Code];
1558-
AsmnameDeclAttrLayout::emitRecord(Out, ScratchRecord, abbrCode,
1555+
case DAK_SILGenName: {
1556+
auto *theAttr = cast<SILGenNameAttr>(DA);
1557+
auto abbrCode = DeclTypeAbbrCodes[SILGenNameDeclAttrLayout::Code];
1558+
SILGenNameDeclAttrLayout::emitRecord(Out, ScratchRecord, abbrCode,
15591559
theAttr->isImplicit(),
15601560
theAttr->Name);
15611561
return;

‎stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@asmname("swift_stdlib_getPointer")
13+
@_silgen_name("swift_stdlib_getPointer")
1414
func _stdlib_getPointer(x: COpaquePointer) -> COpaquePointer
1515

1616
public func _opaqueIdentity<T>(x: T) -> T {

‎stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

+2-2
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ var _testSuiteNameToIndex: [String : Int] = [:]
444444

445445
let _stdlibUnittestStreamPrefix = "__STDLIB_UNITTEST__"
446446

447-
@asmname("swift_stdlib_installTrapInterceptor")
447+
@_silgen_name("swift_stdlib_installTrapInterceptor")
448448
func _stdlib_installTrapInterceptor()
449449

450450
func _childProcess() {
@@ -966,7 +966,7 @@ public class TestSuite {
966966
}
967967

968968
#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
969-
@asmname("swift_stdlib_getSystemVersionPlistProperty")
969+
@_silgen_name("swift_stdlib_getSystemVersionPlistProperty")
970970
func _stdlib_getSystemVersionPlistPropertyImpl(
971971
propertyName: UnsafePointer<CChar>) -> UnsafePointer<CChar>
972972

‎stdlib/private/StdlibUnittest/TestHelpers.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class DummyClass {}
22

33
// Used by the weak.mm runtime tests. All that matters is that the returned
44
// object is an instance of a pure Swift class.
5-
@asmname("make_swift_object")
5+
@_silgen_name("make_swift_object")
66
public func make_swift_object() -> AnyObject {
77
return DummyClass()
88
}

‎stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ import Glibc
2020
// swift_posix_spawn isn't available in the public watchOS SDK, we sneak by the
2121
// unavailable attribute declaration here of the APIs that we need.
2222

23-
@asmname("posix_spawn_file_actions_init")
23+
@_silgen_name("posix_spawn_file_actions_init")
2424
func swift_posix_spawn_file_actions_init(
2525
file_actions: UnsafeMutablePointer<posix_spawn_file_actions_t>) -> CInt
2626

27-
@asmname("posix_spawn_file_actions_destroy")
27+
@_silgen_name("posix_spawn_file_actions_destroy")
2828
func swift_posix_spawn_file_actions_destroy(
2929
file_actions: UnsafeMutablePointer<posix_spawn_file_actions_t>) -> CInt
3030

31-
@asmname("posix_spawn_file_actions_addclose")
31+
@_silgen_name("posix_spawn_file_actions_addclose")
3232
func swift_posix_spawn_file_actions_addclose(file_actions:
3333
UnsafeMutablePointer<posix_spawn_file_actions_t>, _ filedes: CInt) -> CInt
3434

35-
@asmname("posix_spawn_file_actions_adddup2")
35+
@_silgen_name("posix_spawn_file_actions_adddup2")
3636
func swift_posix_spawn_file_actions_adddup2(
3737
file_actions: UnsafeMutablePointer<posix_spawn_file_actions_t>,
3838
_ filedes: CInt,
3939
_ newfiledes: CInt) -> CInt
4040

41-
@asmname("posix_spawn")
41+
@_silgen_name("posix_spawn")
4242
func swift_posix_spawn(
4343
pid: UnsafeMutablePointer<pid_t>,
4444
_ file: UnsafePointer<Int8>,
@@ -225,7 +225,7 @@ public func runChild(args: [String])
225225
}
226226

227227
#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
228-
@asmname("_NSGetEnviron")
228+
@_silgen_name("_NSGetEnviron")
229229
func _NSGetEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<UnsafeMutablePointer<CChar>>>
230230
#endif
231231

‎stdlib/public/SDK/AppKit/AppKit.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public extension NSGradient {
119119

120120
// Fix the ARGV type of NSApplicationMain, which nonsensically takes
121121
// argv as a const char**.
122-
@asmname("NSApplicationMain")
122+
@_silgen_name("NSApplicationMain")
123123
public func NSApplicationMain(
124124
argc: Int32, _ argv: UnsafeMutablePointer<UnsafeMutablePointer<CChar>>
125125
) -> Int32

‎stdlib/public/SDK/Darwin/Darwin.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ public var stderr : UnsafeMutablePointer<FILE> {
144144
//===----------------------------------------------------------------------===//
145145

146146
@warn_unused_result
147-
@asmname("_swift_Darwin_open")
147+
@_silgen_name("_swift_Darwin_open")
148148
func _swift_Darwin_open(path: UnsafePointer<CChar>,
149149
_ oflag: CInt, _ mode: mode_t) -> CInt
150150

151151
@warn_unused_result
152-
@asmname("_swift_Darwin_openat")
152+
@_silgen_name("_swift_Darwin_openat")
153153
func _swift_Darwin_openat(fd: CInt,
154154
_ path: UnsafePointer<CChar>,
155155
_ oflag: CInt, _ mode: mode_t) -> CInt
@@ -253,14 +253,14 @@ public var SEM_FAILED: UnsafeMutablePointer<sem_t> {
253253
}
254254

255255
@warn_unused_result
256-
@asmname("_swift_Darwin_sem_open2")
256+
@_silgen_name("_swift_Darwin_sem_open2")
257257
internal func _swift_Darwin_sem_open2(
258258
name: UnsafePointer<CChar>,
259259
_ oflag: CInt
260260
) -> UnsafeMutablePointer<sem_t>
261261

262262
@warn_unused_result
263-
@asmname("_swift_Darwin_sem_open4")
263+
@_silgen_name("_swift_Darwin_sem_open4")
264264
internal func _swift_Darwin_sem_open4(
265265
name: UnsafePointer<CChar>,
266266
_ oflag: CInt,

‎stdlib/public/SDK/Darwin/tgmath.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public func frexp(value: ${T}) -> (${T}, Int) {
228228
% end
229229

230230
% # This would be AllFloatTypes not OverlayFloatTypes because of the Int return.
231-
% # ... except we need an asmname to avoid an overload ambiguity.
231+
% # ... except we need an _silgen_name to avoid an overload ambiguity.
232232
% for T, CT, f in OverlayFloatTypes():
233233
@_transparent
234234
@warn_unused_result
@@ -239,7 +239,7 @@ public func ilogb(x: ${T}) -> Int {
239239
% end
240240

241241
@warn_unused_result
242-
@asmname("ilogb")
242+
@_silgen_name("ilogb")
243243
func _swift_Darwin_ilogb(value: CDouble) -> CInt
244244

245245
@_transparent
@@ -263,7 +263,7 @@ public func scalbn(x: ${T}, _ n: Int) -> ${T} {
263263
% for T, CT, f in AllFloatTypes():
264264
% # The real lgamma_r is not imported because it hides behind macro _REENTRANT.
265265
@warn_unused_result
266-
@asmname("lgamma${f}_r")
266+
@_silgen_name("lgamma${f}_r")
267267
func _swift_Darwin_lgamma${f}_r(_: ${CT},
268268
_: UnsafeMutablePointer<CInt>) -> ${CT}
269269
@_transparent

0 commit comments

Comments
 (0)