From 6f6103c4dbc77d5bceae7c8e766ec3cabc293364 Mon Sep 17 00:00:00 2001 From: Julius Ikkala Date: Sat, 3 May 2025 23:27:03 +0300 Subject: Add IREnumType to distinguish enums from ints and each other (#6973) * Add IREnumType to distinguish enums from ints and each other * Add issue example as test * format code * Add expected test output * Fix peephole optimization hanging No idea why this PR triggered this, but there seems to have been a clear bug here anyway, so may just as well fix it now. * Move enum lowering later * Add linkage decoration to enum type * Use filecheck-buffer instead of expected.txt * Fix comment * Make enum casts actually use IR enum casts They were all BuiltinCasts by accident * Lower enum type before VM * Deal with rate-qualified types in enum cast * Allow any value marshalling for enum types * Handle new enum instructions in a couple more switches * Fix formatting --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- source/slang/slang-ir-util.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source/slang/slang-ir-util.cpp') diff --git a/source/slang/slang-ir-util.cpp b/source/slang/slang-ir-util.cpp index 36aec22b5..5aae53747 100644 --- a/source/slang/slang-ir-util.cpp +++ b/source/slang/slang-ir-util.cpp @@ -106,6 +106,7 @@ IROp getTypeStyle(IROp op) { case kIROp_VoidType: case kIROp_BoolType: + case kIROp_EnumType: { return op; } @@ -220,6 +221,7 @@ bool isValueType(IRInst* dataType) case kIROp_FuncType: case kIROp_RaytracingAccelerationStructureType: case kIROp_GLSLAtomicUintType: + case kIROp_EnumType: return true; default: // Read-only resource handles are considered as Value type. @@ -271,6 +273,12 @@ bool isSimpleDataType(IRType* type) case kIROp_AnyValueType: case kIROp_PtrType: return true; + case kIROp_EnumType: + { + auto enumType = as(type); + auto tagType = enumType->getTagType(); + return isSimpleDataType(tagType); + } case kIROp_ArrayType: case kIROp_UnsizedArrayType: return isSimpleDataType((IRType*)type->getOperand(0)); -- cgit v1.2.3