|
29 | 29 | #include <array>
|
30 | 30 | #include <functional>
|
31 | 31 | #include <initializer_list>
|
32 |
| -#include <iostream> |
33 | 32 |
|
34 | 33 | using namespace clang;
|
35 | 34 | using namespace std::placeholders;
|
@@ -930,29 +929,25 @@ class SyclKernelFieldChecker
|
930 | 929 | bool isValid() { return !IsInvalid; }
|
931 | 930 |
|
932 | 931 | bool handleReferenceType(FieldDecl *FD, QualType FieldTy) final {
|
933 |
| - bool bad = Diag.Report(FD->getLocation(), diag::err_bad_kernel_param_type) |
934 |
| - << FieldTy; |
935 |
| - IsInvalid |= bad; |
936 |
| - return !bad; |
| 932 | + Diag.Report(FD->getLocation(), diag::err_bad_kernel_param_type) << FieldTy; |
| 933 | + IsInvalid = true; |
| 934 | + return isValid(); |
937 | 935 | }
|
938 | 936 |
|
939 | 937 | bool handleStructType(FieldDecl *FD, QualType FieldTy) final {
|
940 |
| - bool bad = checkNotCopyableToKernel(FD, FieldTy); |
941 |
| - IsInvalid |= bad; |
942 |
| - return !bad; |
| 938 | + IsInvalid |= checkNotCopyableToKernel(FD, FieldTy); |
| 939 | + return isValid(); |
943 | 940 | }
|
944 | 941 |
|
945 | 942 | bool handleArrayType(FieldDecl *FD, QualType FieldTy) final {
|
946 |
| - bool bad = checkNotCopyableToKernel(FD, FieldTy); |
947 |
| - IsInvalid |= bad; |
948 |
| - return !bad; |
| 943 | + IsInvalid |= checkNotCopyableToKernel(FD, FieldTy); |
| 944 | + return isValid(); |
949 | 945 | }
|
950 | 946 |
|
951 | 947 | bool handleOtherType(FieldDecl *FD, QualType FieldTy) final {
|
952 |
| - bool bad = Diag.Report(FD->getLocation(), diag::err_bad_kernel_param_type) |
953 |
| - << FieldTy; |
954 |
| - IsInvalid |= bad; |
955 |
| - return !bad; |
| 948 | + Diag.Report(FD->getLocation(), diag::err_bad_kernel_param_type) << FieldTy; |
| 949 | + IsInvalid = true; |
| 950 | + return isValid(); |
956 | 951 | }
|
957 | 952 | };
|
958 | 953 |
|
@@ -2278,13 +2273,7 @@ SYCLIntegrationHeader::SYCLIntegrationHeader(DiagnosticsEngine &_Diag,
|
2278 | 2273 | // -----------------------------------------------------------------------------
|
2279 | 2274 |
|
2280 | 2275 | bool Util::isSyclAccessorType(const QualType &Ty) {
|
2281 |
| - std::cerr << "isSyclAccessorType:Ty\n"; |
2282 |
| - Ty->dump(); |
2283 |
| - bool b = isSyclType(Ty, "accessor", true /*Tmpl*/) || isSyclType(Ty, "accessor_common", true /*Tmpl*/); |
2284 |
| - std::cerr << (b ? "IS" |
2285 |
| - : "NOT") |
2286 |
| - << " an accessor\n\n"; |
2287 |
| - return b; |
| 2276 | + return isSyclType(Ty, "accessor", true /*Tmpl*/); |
2288 | 2277 | }
|
2289 | 2278 |
|
2290 | 2279 | bool Util::isSyclSamplerType(const QualType &Ty) {
|
|
0 commit comments