Skip to content

Commit 44492ee

Browse files
committed
Change Alignment.valueInBits to a function for consistency with Size
1 parent e16df57 commit 44492ee

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

Sources/LLVM/DIBuilder.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ extension DIBuilder {
400400
self.llvm, scope.asMetadata(),
401401
name, name.count, file.asMetadata(), UInt32(line),
402402
type.asMetadata(), alwaysPreserve.llvm,
403-
flags.llvm, alignment.valueInBits)
403+
flags.llvm, alignment.valueInBits())
404404
else {
405405
fatalError("Failed to allocate metadata for a local variable")
406406
}
@@ -516,7 +516,7 @@ extension DIBuilder {
516516
guard let ty = LLVMDIBuilderCreateEnumerationType(
517517
self.llvm, scope.asMetadata(),
518518
name, name.count, file.asMetadata(), UInt32(line),
519-
size.valueInBits(), alignment.valueInBits,
519+
size.valueInBits(), alignment.valueInBits(),
520520
buf.baseAddress!, UInt32(buf.count),
521521
underlyingType.asMetadata())
522522
else {
@@ -551,7 +551,7 @@ extension DIBuilder {
551551
guard let ty = LLVMDIBuilderCreateUnionType(
552552
self.llvm, scope.asMetadata(),
553553
name, name.count, file.asMetadata(), UInt32(line),
554-
size.valueInBits(), alignment.valueInBits,
554+
size.valueInBits(), alignment.valueInBits(),
555555
flags.llvm, buf.baseAddress!, UInt32(buf.count),
556556
UInt32(runtimeVersion), uniqueID, uniqueID.count)
557557
else {
@@ -580,7 +580,7 @@ extension DIBuilder {
580580
}
581581
return diSubs.withUnsafeMutableBufferPointer { buf in
582582
guard let ty = LLVMDIBuilderCreateArrayType(
583-
self.llvm, size.rawValue, alignment.valueInBits,
583+
self.llvm, size.rawValue, alignment.valueInBits(),
584584
elementType.asMetadata(),
585585
buf.baseAddress!, UInt32(buf.count))
586586
else {
@@ -609,7 +609,7 @@ extension DIBuilder {
609609
}
610610
return diSubs.withUnsafeMutableBufferPointer { buf in
611611
guard let ty = LLVMDIBuilderCreateVectorType(
612-
self.llvm, size.rawValue, alignment.valueInBits,
612+
self.llvm, size.rawValue, alignment.valueInBits(),
613613
elementType.asMetadata(),
614614
buf.baseAddress!, UInt32(buf.count))
615615
else {
@@ -674,7 +674,7 @@ extension DIBuilder {
674674
) -> DIType {
675675
guard let ty = LLVMDIBuilderCreatePointerType(
676676
self.llvm, pointee.asMetadata(),
677-
size.valueInBits(), alignment.valueInBits,
677+
size.valueInBits(), alignment.valueInBits(),
678678
UInt32(addressSpace.rawValue), name, name.count)
679679
else {
680680
fatalError("Failed to allocate metadata")
@@ -708,7 +708,7 @@ extension DIBuilder {
708708
guard let ty = LLVMDIBuilderCreateStructType(
709709
self.llvm, scope.asMetadata(), name, name.count,
710710
file.asMetadata(), UInt32(line),
711-
size.valueInBits(), alignment.valueInBits,
711+
size.valueInBits(), alignment.valueInBits(),
712712
flags.llvm,
713713
baseType?.asMetadata(),
714714
buf.baseAddress!, UInt32(buf.count), UInt32(runtimeVersion),
@@ -740,7 +740,7 @@ extension DIBuilder {
740740
guard let ty = LLVMDIBuilderCreateMemberType(
741741
self.llvm, scope.asMetadata(), name, name.count, file.asMetadata(),
742742
UInt32(line),
743-
size.valueInBits(), alignment.valueInBits,
743+
size.valueInBits(), alignment.valueInBits(),
744744
offset.rawValue,
745745
flags.llvm, parentType.asMetadata())
746746
else {
@@ -769,7 +769,7 @@ extension DIBuilder {
769769
self.llvm, scope.asMetadata(), name, name.count,
770770
file.asMetadata(), UInt32(line),
771771
parentType.asMetadata(), flags.llvm,
772-
initialValue?.asLLVM(), alignment.valueInBits)
772+
initialValue?.asLLVM(), alignment.valueInBits())
773773
else {
774774
fatalError("Failed to allocate metadata")
775775
}
@@ -791,7 +791,7 @@ extension DIBuilder {
791791
) -> DIType {
792792
guard let ty = LLVMDIBuilderCreateMemberPointerType(
793793
self.llvm, pointee.asMetadata(), baseType.asMetadata(),
794-
size.valueInBits(), alignment.valueInBits,
794+
size.valueInBits(), alignment.valueInBits(),
795795
flags.llvm)
796796
else {
797797
fatalError("Failed to allocate metadata")
@@ -872,7 +872,7 @@ extension DIBuilder {
872872
guard let ty = LLVMDIBuilderCreateTypedef(
873873
self.llvm, type.asMetadata(), name, name.count,
874874
file.asMetadata(), UInt32(line), scope.asMetadata(),
875-
alignment.valueInBits)
875+
alignment.valueInBits())
876876
else {
877877
fatalError("Failed to allocate metadata")
878878
}
@@ -927,7 +927,7 @@ extension DIBuilder {
927927
self.llvm, tag.rawValue, name, name.count,
928928
scope.asMetadata(), file.asMetadata(), UInt32(line),
929929
UInt32(runtimeLanguage),
930-
size.valueInBits(), alignment.valueInBits,
930+
size.valueInBits(), alignment.valueInBits(),
931931
uniqueID, uniqueID.count) else {
932932
fatalError("Failed to allocate metadata")
933933
}
@@ -958,7 +958,7 @@ extension DIBuilder {
958958
self.llvm, tag.rawValue, name, name.count,
959959
scope.asMetadata(), file.asMetadata(), UInt32(line),
960960
UInt32(runtimeVersion),
961-
size.valueInBits(), alignment.valueInBits,
961+
size.valueInBits(), alignment.valueInBits(),
962962
flags.llvm,
963963
uniqueID, uniqueID.count)
964964
else {
@@ -1024,7 +1024,7 @@ extension DIBuilder {
10241024
guard let ty = LLVMDIBuilderCreateClassType(
10251025
self.llvm, scope.asMetadata(), name, name.count,
10261026
file.asMetadata(), UInt32(line),
1027-
size.valueInBits(), alignment.valueInBits,
1027+
size.valueInBits(), alignment.valueInBits(),
10281028
offset.rawValue, flags.llvm,
10291029
baseType?.asMetadata(),
10301030
buf.baseAddress!, UInt32(buf.count),
@@ -1158,7 +1158,7 @@ extension DIBuilder {
11581158
) -> DIType {
11591159
guard let ty = LLVMDIBuilderCreateObjCIVar(
11601160
self.llvm, name, name.count, file.asMetadata(), UInt32(line),
1161-
size.valueInBits(), alignment.valueInBits,
1161+
size.valueInBits(), alignment.valueInBits(),
11621162
offset.rawValue, flags.llvm, type.asMetadata(), property.asMetadata())
11631163
else {
11641164
fatalError("Failed to allocate metadata")
@@ -1257,7 +1257,7 @@ extension DIBuilder {
12571257
type.asMetadata(),
12581258
isLocal.llvm,
12591259
expression?.asMetadata(), declaration?.asMetadata(),
1260-
alignment.valueInBits)
1260+
alignment.valueInBits())
12611261
else {
12621262
fatalError("Failed to allocate metadata")
12631263
}

Sources/LLVM/Units.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ public struct Alignment: Comparable, Hashable {
2222
public var isZero: Bool {
2323
return self.rawValue == 0
2424
}
25-
26-
/// Returns this alignment value in bits
27-
public var valueInBits: UInt32 {
28-
return self.rawValue * 8
25+
26+
/// Returns the value of this alignment in bits according to a given radix.
27+
///
28+
/// - parameter radix: The radix value. Defaults to 8 bits per alignment unit.
29+
/// - returns: A value in bits.
30+
public func valueInBits(radix: UInt32 = 8) -> UInt32 {
31+
return self.rawValue * radix
2932
}
3033

3134
/// Returns the log-base-two value of this alignment as a 32-bit integer.

0 commit comments

Comments
 (0)