Skip to content

Commit 8a61b01

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into private/asachkov/cleanup-old-spec-constants-support
2 parents ac226ca + 23fbba1 commit 8a61b01

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

clang/include/clang/AST/PrettyPrinter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ struct PrintingPolicy {
212212
/// \endcode
213213
unsigned SuppressTypedefs : 1;
214214

215+
/// When true, suppress printing final specifier.
216+
unsigned SuppressFinalSpecifier : 1;
217+
215218
/// When true, suppresses printing template arguments in names of C++
216219
/// constructors.
217220
unsigned SuppressTemplateArgsInCXXConstructors : 1;
@@ -220,9 +223,6 @@ struct PrintingPolicy {
220223
/// argument for the parameter.
221224
unsigned SuppressDefaultTemplateArgs : 1;
222225

223-
/// When true, suppress printing final specifier.
224-
unsigned SuppressFinalSpecifier : 1;
225-
226226
/// Whether we can use 'bool' rather than '_Bool' (even if the language
227227
/// doesn't actually have 'bool', because, e.g., it is defined as a macro).
228228
unsigned Bool : 1;

sycl/source/kernel_bundle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ std::vector<kernel_id> get_kernel_ids() {
292292

293293
bool is_compatible(const std::vector<kernel_id> &KernelIDs, const device &Dev) {
294294
if (KernelIDs.empty())
295-
return false;
295+
return true;
296296
// TODO: also need to check that the architecture specified by the
297297
// "-fsycl-targets" flag matches the device when we are able to get the
298298
// device's arch.

sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_with_aspects.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ int main() {
2424
sycl::device Dev;
2525
sycl::queue Q(Dev);
2626

27+
// Returns true for empty vector of kernels
28+
assert(sycl::is_compatible({}, Dev));
29+
2730
if (sycl::is_compatible<KernelCPU>(Dev)) {
2831
Q.submit(
2932
[&](sycl::handler &h) { h.single_task<KernelCPU>([=]() { foo(); }); });

0 commit comments

Comments
 (0)