diff options
| author | Alexey Bader <aleksey.bader@mail.ru> | 2016-04-13 08:33:41 +0000 |
|---|---|---|
| committer | Alexey Bader <aleksey.bader@mail.ru> | 2016-04-13 08:33:41 +0000 |
| commit | b62f14400f301c6bbc891176b9008e39b1e01964 (patch) | |
| tree | 307fe13eb09e63711cef5631a2c0bd29059541fe /clang/lib/AST/ASTContext.cpp | |
| parent | 58d6a959be057126f2063431d4eb9542de07aab9 (diff) | |
| download | bcm5719-llvm-b62f14400f301c6bbc891176b9008e39b1e01964.tar.gz bcm5719-llvm-b62f14400f301c6bbc891176b9008e39b1e01964.zip | |
[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.
llvm-svn: 266180
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 370155873c0..fb4c80bd7fd 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -1093,7 +1093,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target, if (LangOpts.OpenCL) { #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \ InitBuiltinType(SingletonId, BuiltinType::Id); -#include "clang/AST/OpenCLImageTypes.def" +#include "clang/Basic/OpenCLImageTypes.def" InitBuiltinType(OCLSamplerTy, BuiltinType::OCLSampler); InitBuiltinType(OCLEventTy, BuiltinType::OCLEvent); @@ -1673,7 +1673,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const { case BuiltinType::OCLReserveID: #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \ case BuiltinType::Id: -#include "clang/AST/OpenCLImageTypes.def" +#include "clang/Basic/OpenCLImageTypes.def" // Currently these types are pointers to opaque types. Width = Target->getPointerWidth(0); @@ -5501,7 +5501,7 @@ static char getObjCEncodingForPrimitiveKind(const ASTContext *C, // OpenCL and placeholder types don't need @encodings. #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \ case BuiltinType::Id: -#include "clang/AST/OpenCLImageTypes.def" +#include "clang/Basic/OpenCLImageTypes.def" case BuiltinType::OCLEvent: case BuiltinType::OCLClkEvent: case BuiltinType::OCLQueue: |
