Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 4f328fe

Browse files
baderbader
committed
[OpenCL] Move OpenCLImageTypes.def from clangAST to clangBasic library.
Putting OpenCLImageTypes.def to clangAST library violates layering requirement: "It's not OK for a Basic/ header to include an AST/ header". This fixes the modules build. Differential revision: http://reviews.llvm.org/D18954 Reviewers: Richard Smith, Vassil Vassilev. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@266180 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent f637449 commit 4f328fe

32 files changed

+42
-42
lines changed

‎include/clang/AST/ASTContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
904904
CanQualType ObjCBuiltinBoolTy;
905905
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
906906
CanQualType SingletonId;
907-
#include "clang/AST/OpenCLImageTypes.def"
907+
#include "clang/Basic/OpenCLImageTypes.def"
908908
CanQualType OCLSamplerTy, OCLEventTy, OCLClkEventTy;
909909
CanQualType OCLQueueTy, OCLNDRangeTy, OCLReserveIDTy;
910910
CanQualType OMPArraySectionTy;

‎include/clang/AST/Type.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ class Type : public ExtQualsTypeCommonBase {
17071707

17081708
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
17091709
bool is##Id##Type() const;
1710-
#include "clang/AST/OpenCLImageTypes.def"
1710+
#include "clang/Basic/OpenCLImageTypes.def"
17111711

17121712
bool isImageType() const; // Any OpenCL image type
17131713

@@ -2010,7 +2010,7 @@ class BuiltinType : public Type {
20102010
enum Kind {
20112011
// OpenCL image types
20122012
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) Id,
2013-
#include "clang/AST/OpenCLImageTypes.def"
2013+
#include "clang/Basic/OpenCLImageTypes.def"
20142014
// All other builtin types
20152015
#define BUILTIN_TYPE(Id, SingletonId) Id,
20162016
#define LAST_BUILTIN_TYPE(Id) LastKind = Id
@@ -5556,7 +5556,7 @@ inline bool Type::isObjCBuiltinType() const {
55565556
inline bool Type::is##Id##Type() const { \
55575557
return isSpecificBuiltinType(BuiltinType::Id); \
55585558
}
5559-
#include "clang/AST/OpenCLImageTypes.def"
5559+
#include "clang/Basic/OpenCLImageTypes.def"
55605560

55615561
inline bool Type::isSamplerT() const {
55625562
return isSpecificBuiltinType(BuiltinType::OCLSampler);
@@ -5585,7 +5585,7 @@ inline bool Type::isReserveIDT() const {
55855585
inline bool Type::isImageType() const {
55865586
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) is##Id##Type() ||
55875587
return
5588-
#include "clang/AST/OpenCLImageTypes.def"
5588+
#include "clang/Basic/OpenCLImageTypes.def"
55895589
0; // end boolean or operation
55905590
}
55915591

‎include/clang/AST/OpenCLImageTypes.def ‎include/clang/Basic/OpenCLImageTypes.def

File renamed without changes.

‎include/clang/Basic/Specifiers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace clang {
7474
TST_unknown_anytype, // __unknown_anytype extension
7575
TST_atomic, // C11 _Atomic
7676
#define GENERIC_IMAGE_TYPE(ImgType, Id) TST_##ImgType##_t, // OpenCL image types
77-
#include "clang/AST/OpenCLImageTypes.def"
77+
#include "clang/Basic/OpenCLImageTypes.def"
7878
TST_error // erroneous type
7979
};
8080

‎include/clang/Basic/TokenKinds.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ ALIAS("read_write", __read_write , KEYOPENCL)
519519
KEYWORD(__builtin_astype , KEYOPENCL)
520520
KEYWORD(vec_step , KEYOPENCL|KEYALTIVEC|KEYZVECTOR)
521521
#define GENERIC_IMAGE_TYPE(ImgType, Id) KEYWORD(ImgType##_t, KEYOPENCL)
522-
#include "clang/AST/OpenCLImageTypes.def"
522+
#include "clang/Basic/OpenCLImageTypes.def"
523523

524524
// OpenMP Type Traits
525525
KEYWORD(__builtin_omp_required_simd_align, KEYALL)

‎include/clang/Sema/DeclSpec.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ class DeclSpec {
301301
static const TST TST_atomic = clang::TST_atomic;
302302
#define GENERIC_IMAGE_TYPE(ImgType, Id) \
303303
static const TST TST_##ImgType##_t = clang::TST_##ImgType##_t;
304-
#include "clang/AST/OpenCLImageTypes.def"
304+
#include "clang/Basic/OpenCLImageTypes.def"
305305
static const TST TST_error = clang::TST_error;
306306

307307
// type-qualifiers

‎include/clang/Serialization/ASTBitCodes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ namespace clang {
801801
/// \brief OpenCL image types with auto numeration
802802
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
803803
PREDEF_TYPE_##Id##_ID,
804-
#include "clang/AST/OpenCLImageTypes.def"
804+
#include "clang/Basic/OpenCLImageTypes.def"
805805
};
806806

807807
/// \brief The number of predefined type IDs that are reserved for

‎lib/AST/ASTContext.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
10931093
if (LangOpts.OpenCL) {
10941094
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
10951095
InitBuiltinType(SingletonId, BuiltinType::Id);
1096-
#include "clang/AST/OpenCLImageTypes.def"
1096+
#include "clang/Basic/OpenCLImageTypes.def"
10971097

10981098
InitBuiltinType(OCLSamplerTy, BuiltinType::OCLSampler);
10991099
InitBuiltinType(OCLEventTy, BuiltinType::OCLEvent);
@@ -1673,7 +1673,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const {
16731673
case BuiltinType::OCLReserveID:
16741674
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
16751675
case BuiltinType::Id:
1676-
#include "clang/AST/OpenCLImageTypes.def"
1676+
#include "clang/Basic/OpenCLImageTypes.def"
16771677

16781678
// Currently these types are pointers to opaque types.
16791679
Width = Target->getPointerWidth(0);
@@ -5501,7 +5501,7 @@ static char getObjCEncodingForPrimitiveKind(const ASTContext *C,
55015501
// OpenCL and placeholder types don't need @encodings.
55025502
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
55035503
case BuiltinType::Id:
5504-
#include "clang/AST/OpenCLImageTypes.def"
5504+
#include "clang/Basic/OpenCLImageTypes.def"
55055505
case BuiltinType::OCLEvent:
55065506
case BuiltinType::OCLClkEvent:
55075507
case BuiltinType::OCLQueue:

‎lib/AST/ASTImporter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1512,7 +1512,7 @@ QualType ASTNodeImporter::VisitBuiltinType(const BuiltinType *T) {
15121512
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
15131513
case BuiltinType::Id: \
15141514
return Importer.getToContext().SingletonId;
1515-
#include "clang/AST/OpenCLImageTypes.def"
1515+
#include "clang/Basic/OpenCLImageTypes.def"
15161516
#define SHARED_SINGLETON_TYPE(Expansion)
15171517
#define BUILTIN_TYPE(Id, SingletonId) \
15181518
case BuiltinType::Id: return Importer.getToContext().SingletonId;

‎lib/AST/ExprConstant.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6303,7 +6303,7 @@ static int EvaluateBuiltinClassifyType(const CallExpr *E,
63036303
case BuiltinType::ObjCSel:
63046304
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
63056305
case BuiltinType::Id:
6306-
#include "clang/AST/OpenCLImageTypes.def"
6306+
#include "clang/Basic/OpenCLImageTypes.def"
63076307
case BuiltinType::OCLSampler:
63086308
case BuiltinType::OCLEvent:
63096309
case BuiltinType::OCLClkEvent:

‎lib/AST/ItaniumMangle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2097,7 +2097,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
20972097
type_name = "ocl_" #ImgType "_" #Suffix; \
20982098
Out << type_name.size() << type_name; \
20992099
break;
2100-
#include "clang/AST/OpenCLImageTypes.def"
2100+
#include "clang/Basic/OpenCLImageTypes.def"
21012101
case BuiltinType::OCLSampler:
21022102
Out << "11ocl_sampler";
21032103
break;

‎lib/AST/MicrosoftMangle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T, Qualifiers,
17211721
case BuiltinType::Id: \
17221722
Out << "PAUocl_" #ImgType "_" #Suffix "@@"; \
17231723
break;
1724-
#include "clang/AST/OpenCLImageTypes.def"
1724+
#include "clang/Basic/OpenCLImageTypes.def"
17251725
case BuiltinType::OCLSampler:
17261726
Out << "PA";
17271727
mangleArtificalTagType(TTK_Struct, "ocl_sampler");

‎lib/AST/NSAPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ NSAPI::getNSNumberFactoryMethodKind(QualType T) const {
447447
case BuiltinType::ObjCSel:
448448
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
449449
case BuiltinType::Id:
450-
#include "clang/AST/OpenCLImageTypes.def"
450+
#include "clang/Basic/OpenCLImageTypes.def"
451451
case BuiltinType::OCLSampler:
452452
case BuiltinType::OCLEvent:
453453
case BuiltinType::OCLClkEvent:

‎lib/AST/Type.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2584,7 +2584,7 @@ StringRef BuiltinType::getName(const PrintingPolicy &Policy) const {
25842584
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
25852585
case Id: \
25862586
return "__" #Access " " #ImgType "_t";
2587-
#include "clang/AST/OpenCLImageTypes.def"
2587+
#include "clang/Basic/OpenCLImageTypes.def"
25882588
case OCLSampler:
25892589
return "sampler_t";
25902590
case OCLEvent:
@@ -3560,7 +3560,7 @@ bool Type::canHaveNullability() const {
35603560
case BuiltinType::ObjCSel:
35613561
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
35623562
case BuiltinType::Id:
3563-
#include "clang/AST/OpenCLImageTypes.def"
3563+
#include "clang/Basic/OpenCLImageTypes.def"
35643564
case BuiltinType::OCLSampler:
35653565
case BuiltinType::OCLEvent:
35663566
case BuiltinType::OCLClkEvent:

‎lib/AST/TypeLoc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ TypeSpecifierType BuiltinTypeLoc::getWrittenTypeSpec() const {
335335
case BuiltinType::ObjCSel:
336336
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
337337
case BuiltinType::Id:
338-
#include "clang/AST/OpenCLImageTypes.def"
338+
#include "clang/Basic/OpenCLImageTypes.def"
339339
case BuiltinType::OCLSampler:
340340
case BuiltinType::OCLEvent:
341341
case BuiltinType::OCLClkEvent:

‎lib/Analysis/PrintfFormatString.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ bool PrintfSpecifier::fixType(QualType QT, const LangOptions &LangOpt,
621621

622622
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
623623
case BuiltinType::Id:
624-
#include "clang/AST/OpenCLImageTypes.def"
624+
#include "clang/Basic/OpenCLImageTypes.def"
625625
#define SIGNED_TYPE(Id, SingletonId)
626626
#define UNSIGNED_TYPE(Id, SingletonId)
627627
#define FLOATING_TYPE(Id, SingletonId)

‎lib/CodeGen/CGDebugInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
478478
case BuiltinType::Id: \
479479
return getOrCreateStructPtrType("opencl_" #ImgType "_" #Suffix "_t", \
480480
SingletonId);
481-
#include "clang/AST/OpenCLImageTypes.def"
481+
#include "clang/Basic/OpenCLImageTypes.def"
482482
case BuiltinType::OCLSampler:
483483
return DBuilder.createBasicType(
484484
"opencl_sampler_t", CGM.getContext().getTypeSize(BT),

‎lib/CodeGen/CGDebugInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CGDebugInfo {
6666
llvm::DIType *SelTy = nullptr;
6767
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
6868
llvm::DIType *SingletonId = nullptr;
69-
#include "clang/AST/OpenCLImageTypes.def"
69+
#include "clang/Basic/OpenCLImageTypes.def"
7070
llvm::DIType *OCLEventDITy = nullptr;
7171
llvm::DIType *OCLClkEventDITy = nullptr;
7272
llvm::DIType *OCLQueueDITy = nullptr;

‎lib/CodeGen/CGOpenCLRuntime.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ llvm::Type *CGOpenCLRuntime::convertOpenCLSpecificType(const Type *T) {
4545
return llvm::PointerType::get( \
4646
llvm::StructType::create(Ctx, "opencl." #ImgType "_" #Suffix "_t"), \
4747
ImgAddrSpc);
48-
#include "clang/AST/OpenCLImageTypes.def"
48+
#include "clang/Basic/OpenCLImageTypes.def"
4949
case BuiltinType::OCLSampler:
5050
return llvm::IntegerType::get(Ctx, 32);
5151
case BuiltinType::OCLEvent:

‎lib/CodeGen/CodeGenTypes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
466466

467467
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
468468
case BuiltinType::Id:
469-
#include "clang/AST/OpenCLImageTypes.def"
469+
#include "clang/Basic/OpenCLImageTypes.def"
470470
case BuiltinType::OCLSampler:
471471
case BuiltinType::OCLEvent:
472472
case BuiltinType::OCLClkEvent:

‎lib/CodeGen/ItaniumCXXABI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2538,7 +2538,7 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType *Ty) {
25382538

25392539
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
25402540
case BuiltinType::Id:
2541-
#include "clang/AST/OpenCLImageTypes.def"
2541+
#include "clang/Basic/OpenCLImageTypes.def"
25422542
case BuiltinType::OCLSampler:
25432543
case BuiltinType::OCLEvent:
25442544
case BuiltinType::OCLClkEvent:

‎lib/Index/USRGeneration.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ void USRGenerator::VisitType(QualType T) {
626626
case BuiltinType::Dependent:
627627
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
628628
case BuiltinType::Id:
629-
#include "clang/AST/OpenCLImageTypes.def"
629+
#include "clang/Basic/OpenCLImageTypes.def"
630630
case BuiltinType::OCLEvent:
631631
case BuiltinType::OCLClkEvent:
632632
case BuiltinType::OCLQueue:

‎lib/Parse/ParseDecl.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3368,7 +3368,7 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
33683368
isInvalid = DS.SetTypeSpecType(DeclSpec::TST_##ImgType##_t, Loc, PrevSpec, \
33693369
DiagID, Policy); \
33703370
break;
3371-
#include "clang/AST/OpenCLImageTypes.def"
3371+
#include "clang/Basic/OpenCLImageTypes.def"
33723372
case tok::kw___unknown_anytype:
33733373
isInvalid = DS.SetTypeSpecType(TST_unknown_anytype, Loc,
33743374
PrevSpec, DiagID, Policy);
@@ -4307,7 +4307,7 @@ bool Parser::isKnownToBeTypeSpecifier(const Token &Tok) const {
43074307
case tok::kw__Decimal128:
43084308
case tok::kw___vector:
43094309
#define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
4310-
#include "clang/AST/OpenCLImageTypes.def"
4310+
#include "clang/Basic/OpenCLImageTypes.def"
43114311

43124312
// struct-or-union-specifier (C99) or class-specifier (C++)
43134313
case tok::kw_class:
@@ -4381,7 +4381,7 @@ bool Parser::isTypeSpecifierQualifier() {
43814381
case tok::kw__Decimal128:
43824382
case tok::kw___vector:
43834383
#define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
4384-
#include "clang/AST/OpenCLImageTypes.def"
4384+
#include "clang/Basic/OpenCLImageTypes.def"
43854385

43864386
// struct-or-union-specifier (C99) or class-specifier (C++)
43874387
case tok::kw_class:
@@ -4619,7 +4619,7 @@ bool Parser::isDeclarationSpecifier(bool DisambiguatingWithExpression) {
46194619
case tok::kw___read_write:
46204620
case tok::kw___write_only:
46214621
#define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
4622-
#include "clang/AST/OpenCLImageTypes.def"
4622+
#include "clang/Basic/OpenCLImageTypes.def"
46234623

46244624
return true;
46254625
}

‎lib/Parse/ParseExpr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression,
11711171
case tok::kw_typeof:
11721172
case tok::kw___vector:
11731173
#define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
1174-
#include "clang/AST/OpenCLImageTypes.def"
1174+
#include "clang/Basic/OpenCLImageTypes.def"
11751175
{
11761176
if (!getLangOpts().CPlusPlus) {
11771177
Diag(Tok, diag::err_expected_expression);

‎lib/Parse/ParseTentative.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ Parser::isExpressionOrTypeSpecifierSimple(tok::TokenKind Kind) {
988988
case tok::kw___bool:
989989
case tok::kw__Atomic:
990990
#define GENERIC_IMAGE_TYPE(ImgType, Id) case tok::kw_##ImgType##_t:
991-
#include "clang/AST/OpenCLImageTypes.def"
991+
#include "clang/Basic/OpenCLImageTypes.def"
992992
case tok::kw___unknown_anytype:
993993
return TPResult::False;
994994

‎lib/Sema/DeclSpec.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ bool Declarator::isDeclarationOfFunction() const {
303303
case TST_void:
304304
case TST_wchar:
305305
#define GENERIC_IMAGE_TYPE(ImgType, Id) case TST_##ImgType##_t:
306-
#include "clang/AST/OpenCLImageTypes.def"
306+
#include "clang/Basic/OpenCLImageTypes.def"
307307
return false;
308308

309309
case TST_decltype_auto:
@@ -479,7 +479,7 @@ const char *DeclSpec::getSpecifierName(DeclSpec::TST T,
479479
#define GENERIC_IMAGE_TYPE(ImgType, Id) \
480480
case DeclSpec::TST_##ImgType##_t: \
481481
return #ImgType "_t";
482-
#include "clang/AST/OpenCLImageTypes.def"
482+
#include "clang/Basic/OpenCLImageTypes.def"
483483
case DeclSpec::TST_error: return "(error)";
484484
}
485485
llvm_unreachable("Unknown typespec!");

‎lib/Sema/SemaExpr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4917,7 +4917,7 @@ static bool isPlaceholderToRemoveAsArg(QualType type) {
49174917
// Ignore all the non-placeholder types.
49184918
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
49194919
case BuiltinType::Id:
4920-
#include "clang/AST/OpenCLImageTypes.def"
4920+
#include "clang/Basic/OpenCLImageTypes.def"
49214921
#define PLACEHOLDER_TYPE(ID, SINGLETON_ID)
49224922
#define BUILTIN_TYPE(ID, SINGLETON_ID) case BuiltinType::ID:
49234923
#include "clang/AST/BuiltinTypes.def"
@@ -14902,7 +14902,7 @@ ExprResult Sema::CheckPlaceholderExpr(Expr *E) {
1490214902
// Everything else should be impossible.
1490314903
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
1490414904
case BuiltinType::Id:
14905-
#include "clang/AST/OpenCLImageTypes.def"
14905+
#include "clang/Basic/OpenCLImageTypes.def"
1490614906
#define BUILTIN_TYPE(Id, SingletonId) case BuiltinType::Id:
1490714907
#define PLACEHOLDER_TYPE(Id, SingletonId)
1490814908
#include "clang/AST/BuiltinTypes.def"

‎lib/Sema/SemaTemplateVariadic.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ bool Sema::containsUnexpandedParameterPacks(Declarator &D) {
740740
case TST_auto_type:
741741
case TST_decltype_auto:
742742
#define GENERIC_IMAGE_TYPE(ImgType, Id) case TST_##ImgType##_t:
743-
#include "clang/AST/OpenCLImageTypes.def"
743+
#include "clang/Basic/OpenCLImageTypes.def"
744744
case TST_unknown_anytype:
745745
case TST_error:
746746
break;

‎lib/Sema/SemaType.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ static QualType ConvertDeclSpecToType(TypeProcessingState &state) {
15801580
.Cases("read_write", "__read_write", Context.Id##RWTy) \
15811581
.Default(Context.Id##ROTy); \
15821582
break;
1583-
#include "clang/AST/OpenCLImageTypes.def"
1583+
#include "clang/Basic/OpenCLImageTypes.def"
15841584

15851585
case DeclSpec::TST_error:
15861586
Result = Context.IntTy;

‎lib/Serialization/ASTCommon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ serialization::TypeIdxFromBuiltin(const BuiltinType *BT) {
131131
case BuiltinType::Id: \
132132
ID = PREDEF_TYPE_##Id##_ID; \
133133
break;
134-
#include "clang/AST/OpenCLImageTypes.def"
134+
#include "clang/Basic/OpenCLImageTypes.def"
135135
case BuiltinType::OCLSampler:
136136
ID = PREDEF_TYPE_SAMPLER_ID;
137137
break;

‎lib/Serialization/ASTReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6096,7 +6096,7 @@ QualType ASTReader::GetType(TypeID ID) {
60966096
case PREDEF_TYPE_##Id##_ID: \
60976097
T = Context.SingletonId; \
60986098
break;
6099-
#include "clang/AST/OpenCLImageTypes.def"
6099+
#include "clang/Basic/OpenCLImageTypes.def"
61006100
case PREDEF_TYPE_SAMPLER_ID:
61016101
T = Context.OCLSamplerTy;
61026102
break;

‎tools/libclang/CIndex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ bool CursorVisitor::VisitBuiltinTypeLoc(BuiltinTypeLoc TL) {
14561456
case BuiltinType::Dependent:
14571457
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
14581458
case BuiltinType::Id:
1459-
#include "clang/AST/OpenCLImageTypes.def"
1459+
#include "clang/Basic/OpenCLImageTypes.def"
14601460
case BuiltinType::OCLSampler:
14611461
case BuiltinType::OCLEvent:
14621462
case BuiltinType::OCLClkEvent:

0 commit comments

Comments
 (0)