Skip to content

Commit a753834

Browse files
committed
Enable HLSL
1 parent 9b9b90a commit a753834

File tree

4 files changed

+141
-147
lines changed

4 files changed

+141
-147
lines changed

clang/lib/AST/ASTContext.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,18 +1520,12 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
15201520
// size_t (C99TC3 6.5.3.4), signed size_t (C++23 5.13.2) and
15211521
// ptrdiff_t (C99TC3 6.5.6) Although these types are not built-in, they are
15221522
// part of the core language and are widely used.
1523-
if (!LangOpts.HLSL) {
1524-
// Using PredefinedSugarType makes these types as named sugar types rather
1525-
// than standard integer types, enabling better hints and diagnostics.
1526-
using Kind = PredefinedSugarType::Kind;
1527-
SizeType = getPredefinedSugarType(Kind::SizeT);
1528-
SignedSizeType = getPredefinedSugarType(Kind::SignedSizeT);
1529-
PtrdiffType = getPredefinedSugarType(Kind::PtrdiffT);
1530-
} else {
1531-
SizeType = getFromTargetType(Target.getSizeType());
1532-
SignedSizeType = getFromTargetType(Target.getSignedSizeType());
1533-
PtrdiffType = getFromTargetType(Target.getPtrDiffType(LangAS::Default));
1534-
}
1523+
// Using PredefinedSugarType makes these types as named sugar types rather
1524+
// than standard integer types, enabling better hints and diagnostics.
1525+
using Kind = PredefinedSugarType::Kind;
1526+
SizeType = getPredefinedSugarType(Kind::SizeT);
1527+
SignedSizeType = getPredefinedSugarType(Kind::SignedSizeT);
1528+
PtrdiffType = getPredefinedSugarType(Kind::PtrdiffT);
15351529
}
15361530

15371531
DiagnosticsEngine &ASTContext::getDiagnostics() const {

clang/test/AST/HLSL/is_structured_resource_element_compatible_concept.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// CHECK: | `-TemplateTypeParm {{.*}} 'element_type'
1010
// CHECK: `-BinaryOperator {{.*}} 'bool' lvalue '>='
1111
// CHECK: |-UnaryExprOrTypeTraitExpr {{.*}} 'bool' sizeof 'element_type'
12-
// CHECK: `-IntegerLiteral {{.*}} 'unsigned long' 1
12+
// CHECK: `-IntegerLiteral {{.*}} '__size_t':'unsigned long' 1
1313

1414

1515
StructuredBuffer<float> Buffer;

clang/test/SemaHLSL/Language/AssignArray.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export void fn(int8 A) {
1313
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'vector<int, 4> *' <ArrayToPointerDecay>
1414
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int8':'vector<int, 4>[2]' lvalue
1515
// CHECK-NEXT: DeclRefExpr {{.*}} 'int8':'vector<int, 4>[2]' lvalue Var {{.*}} 'a' 'int8':'vector<int, 4>[2]'
16-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned long'
16+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t':'unsigned long'
1717
int8 b = a;
1818

1919
// CHECK-LABEL: VarDecl {{.*}} c 'int8':'vector<int, 4>[2]' cinit
@@ -25,7 +25,7 @@ export void fn(int8 A) {
2525
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'vector<int, 4> *' <ArrayToPointerDecay>
2626
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'vector<int, 4>[2]' lvalue
2727
// CHECK-NEXT: DeclRefExpr {{.*}} 'vector<int, 4>[2]' lvalue ParmVar {{.*}} 'A' 'vector<int, 4>[2]'
28-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned long'
28+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t':'unsigned long'
2929
int8 c = A;
3030
}
3131

0 commit comments

Comments
 (0)