Skip to content

Commit 8a4a226

Browse files
committed
Undo unintentional llvm::MaybeAlign changes
1 parent c0ab0c9 commit 8a4a226

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

lib/IRGen/GenDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2015,7 +2015,7 @@ swift::irgen::createLinkerDirectiveVariable(IRGenModule &IGM, StringRef name) {
20152015
ApplyIRLinkage({Linkage,
20162016
llvm::GlobalValue::VisibilityTypes::DefaultVisibility,
20172017
llvm::GlobalValue::DLLStorageClassTypes::DefaultStorageClass}).to(var);
2018-
var->setAlignment(Alignment);
2018+
var->setAlignment(llvm::MaybeAlign(Alignment));
20192019
disableAddressSanitizer(IGM, var);
20202020
IGM.addUsedGlobal(var);
20212021
return var;

lib/IRGen/GenKeyPath.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ void IRGenModule::emitSILProperty(SILProperty *prop) {
13161316
fields.finishAndCreateFuture()));
13171317
var->setConstant(true);
13181318
var->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
1319-
var->setAlignment(4);
1319+
var->setAlignment(llvm::MaybeAlign(4));
13201320

13211321
TheTrivialPropertyDescriptor = var;
13221322
} else {

lib/IRGen/GenProto.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,8 @@ void IRGenModule::emitSILWitnessTable(SILWitnessTable *wt) {
21792179
initializer)
21802180
: getAddrOfWitnessTable(conf, initializer));
21812181
global->setConstant(isConstantWitnessTable(wt));
2182-
global->setAlignment(getWitnessTableAlignment().getValue());
2182+
global->setAlignment(
2183+
llvm::MaybeAlign(getWitnessTableAlignment().getValue()));
21832184
tableSize = wtableBuilder.getTableSize();
21842185
} else {
21852186
initializer.abandon();

0 commit comments

Comments
 (0)