Skip to content

[IRGen] Use EnumImplStrategy to generate getEnumTag function for layo… #66707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2023
Merged

[IRGen] Use EnumImplStrategy to generate getEnumTag function for layo… #66707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6be9ff
[IRGen] Use EnumImplStrategy to generate getEnumTag function for layo…
drexin Jun 16, 2023
3c79e8c
Don't use unsupported types in tests
drexin Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/IRGen/TypeLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "FixedTypeInfo.h"
#include "GenOpaque.h"
#include "IRGen.h"
#include "GenEnum.h"
#include "GenExistential.h"
#include "GenericArguments.h"
#include "IRGenFunction.h"
Expand Down Expand Up @@ -510,7 +511,8 @@ llvm::Function *createFixedEnumLoadTag(IRGenModule &IGM,
auto castEnumPtr = IGF.Builder.CreateBitCast(enumPtr, enumType);
auto enumAddr = typeInfo->getAddressForPointer(castEnumPtr);

auto tag = entry.getEnumTag(IGF, enumAddr);
auto &strategy = getEnumImplStrategy(IGM, entry.ty);
auto tag = strategy.emitGetEnumTag(IGF, entry.ty, enumAddr);
IGF.Builder.CreateRet(tag);
});

Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/Inputs/layout_string_witnesses_types.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ public enum SinglePayloadEnumManyXI {
case empty4
case empty5
case empty6
case nonEmpty(Builtin.Int127, SimpleClass)
case nonEmpty(Builtin.Int63, SimpleClass)
}

public struct PrespecializedStruct<T> {
Expand Down
4 changes: 2 additions & 2 deletions test/Interpreter/layout_string_witnesses_static.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -enable-experimental-feature LayoutStringValueWitnesses -enable-layout-string-value-witnesses -enable-type-layout -parse-stdlib -emit-module -emit-module-path=%t/layout_string_witnesses_types.swiftmodule %S/Inputs/layout_string_witnesses_types.swift
// RUN: %target-swift-frontend -enable-experimental-feature LayoutStringValueWitnesses -enable-layout-string-value-witnesses -parse-stdlib -emit-module -emit-module-path=%t/layout_string_witnesses_types.swiftmodule %S/Inputs/layout_string_witnesses_types.swift

// NOTE: We have to build this as dylib to turn private external symbols into local symbols, so we can observe potential issues with linkage
// RUN: %target-build-swift-dylib(%t/%target-library-name(layout_string_witnesses_types)) -Xfrontend -enable-experimental-feature -Xfrontend LayoutStringValueWitnesses -Xfrontend -enable-layout-string-value-witnesses -Xfrontend -enable-type-layout -Xfrontend -parse-stdlib -parse-as-library %S/Inputs/layout_string_witnesses_types.swift
// RUN: %target-build-swift-dylib(%t/%target-library-name(layout_string_witnesses_types)) -Xfrontend -enable-experimental-feature -Xfrontend LayoutStringValueWitnesses -Xfrontend -enable-layout-string-value-witnesses -Xfrontend -parse-stdlib -parse-as-library %S/Inputs/layout_string_witnesses_types.swift
// RUN: %target-codesign %t/%target-library-name(layout_string_witnesses_types)
// RUN: %target-swift-frontend -enable-experimental-feature LayoutStringValueWitnesses -enable-layout-string-value-witnesses -enable-library-evolution -emit-module -emit-module-path=%t/layout_string_witnesses_types_resilient.swiftmodule %S/Inputs/layout_string_witnesses_types_resilient.swift
// RUN: %target-build-swift -g -Xfrontend -enable-experimental-feature -Xfrontend LayoutStringValueWitnesses -Xfrontend -enable-layout-string-value-witnesses -Xfrontend -enable-library-evolution -c -parse-as-library -o %t/layout_string_witnesses_types_resilient.o %S/Inputs/layout_string_witnesses_types_resilient.swift
Expand Down